From fc2796a81e753611676c0697ae0bf648330cd033 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 2 Nov 2017 08:36:24 +0000
Subject: [PATCH] update to 2.2.5 (#1508667) Resolves: rhbz#1508667

---
 .gitignore                |  1 +
 expat-2.2.5-doc2man.patch | 26 ++++++++++++++++++++++++++
 expat.spec                | 16 ++++++++--------
 sources                   |  2 +-
 4 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 expat-2.2.5-doc2man.patch

diff --git a/.gitignore b/.gitignore
index 5b47de5..8a17f27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ expat-2.0.1.tar.gz
 /libexpat-R_*
 /expat-2.2.3.tar.gz
 /expat-2.2.4.tar.gz
+/expat-2.2.5.tar.gz
diff --git a/expat-2.2.5-doc2man.patch b/expat-2.2.5-doc2man.patch
new file mode 100644
index 0000000..59c7136
--- /dev/null
+++ b/expat-2.2.5-doc2man.patch
@@ -0,0 +1,26 @@
+diff -uap libexpat-R_2_2_5/expat/configure.ac.doc2man libexpat-R_2_2_5/expat/configure.ac
+--- libexpat-R_2_2_5/expat/configure.ac.doc2man
++++ libexpat-R_2_2_5/expat/configure.ac
+@@ -241,7 +241,7 @@ AS_IF([test "x$with_docbook" != xno],
+   [if test "x$with_docbook" != xcheck; then 
+     AC_MSG_ERROR([Required program 'docbook2x-man' not found.])])])
+ 
+-AM_CONDITIONAL(WITH_DOCBOOK, [test x${DOCBOOK_TO_MAN} != x])
++AM_CONDITIONAL(WITH_DOCBOOK, [test "x${DOCBOOK_TO_MAN}" != x])
+ 
+ AC_CONFIG_FILES([Makefile expat.pc])
+ AC_CONFIG_FILES([
+diff -uap libexpat-R_2_2_5/expat/doc/Makefile.am.doc2man libexpat-R_2_2_5/expat/doc/Makefile.am
+--- libexpat-R_2_2_5/expat/doc/Makefile.am.doc2man
++++ libexpat-R_2_2_5/expat/doc/Makefile.am
+@@ -32,8 +32,9 @@ dist_man_MANS = xmlwf.1
+ 
+ xmlwf.1: xmlwf.xml
+ if WITH_DOCBOOK
++	-rm -f $@
+ 	$(DOCBOOK_TO_MAN) $<
+-	mv XMLWF.1 $@
++	test -f $@ || mv XMLWF.1 $@
+ else
+ 	@echo 'ERROR: Configure with --with-docbook for "make dist".' 1>&2
+ 	@false
diff --git a/expat.spec b/expat.spec
index 4f75af8..0e3b460 100644
--- a/expat.spec
+++ b/expat.spec
@@ -1,4 +1,4 @@
-%global unversion 2_2_4
+%global unversion 2_2_5
 
 Summary: An XML parser library
 Name: expat
@@ -7,7 +7,8 @@ Release: 1%{?dist}
 Source: https://github.com/libexpat/libexpat/archive/R_%{unversion}.tar.gz#/expat-%{version}.tar.gz
 URL: https://libexpat.github.io/
 License: MIT
-BuildRequires: autoconf, libtool, xmlto
+BuildRequires: autoconf, libtool, xmlto, gcc-c++
+Patch0: expat-2.2.5-doc2man.patch
 
 %description
 This is expat, the C library for parsing XML, written by James Clark. Expat
@@ -35,17 +36,13 @@ Install it if you need to link statically with expat.
 
 %prep
 %setup -q -n libexpat-R_%{unversion}/expat
-sed -i '
-s/docbook2x-man/xmlto man --skip-validation/
-/^xmlwf.1: XMLWF/d
-/cp \$</d
-s/^XMLWF.1/xmlwf.1/
-' doc/doc.mk
+%patch0 -p2 -b .doc2man
 sed -i 's/install-data-hook/do-nothing-please/' lib/Makefile.am
 ./buildconf.sh
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+export DOCBOOK_TO_MAN="xmlto man --skip-validation"
 %configure
 make %{?_smp_mflags}
 
@@ -78,6 +75,9 @@ make check
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Nov  2 2017 Joe Orton <jorton@redhat.com> - 2.2.5-1
+- update to 2.2.5 (#1508667)
+
 * Mon Aug 21 2017 Joe Orton <jorton@redhat.com> - 2.2.4-1
 - update to 2.2.4 (#1483359)
 
diff --git a/sources b/sources
index d2d27a4..043438b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (expat-2.2.4.tar.gz) = 64f9deb2f75be70450a60a408ab867d1df800022e29000a31a801d85421178b400ebbf817864d1592ce998ada1012fa25fd896e5f25c6b314851ae62d94b45dc
+SHA512 (expat-2.2.5.tar.gz) = 61ce2a479521412e0c56c352106c4adfb61a6bedb883921aba3ebccc29311ddd192646ac2c51b41572728d4de6ab4cb60a1dbc71515d742a80a8b59d89ca74d6