From d644291a07af632d485c0e3f2322b189bca38e4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 5 Jul 2018 08:26:55 +0000
Subject: [PATCH] fixed rpm build for all distros

---
 INSTALL            |  2 +-
 bootstrap.sh       |  5 ++++-
 build-in-docker.sh | 10 +++++-----
 libxml-cxx.spec.in |  5 ++++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index ddcdb76..8b641e3 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.15/INSTALL
\ No newline at end of file
+/usr/share/automake-1.13/INSTALL
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
index 90f48d1..3527f9b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1678,7 +1678,7 @@ fi)
 $(if testtag AX_RPM_DEPEND; then echo "Requires: @RPM_DEPEND@"; fi)
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: which, pkgconfig, pandoc, gnupg, expect, ${VCSDEPENDS_RPM}make, automake, autoconf, rpm-build$(
+BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake, autoconf, rpm-build$(
     if testtag AX_USE_CXX; then
       echo -n ", binutils-devel, gcc-c++"
     fi
@@ -1719,6 +1719,9 @@ $(
     if testtag AX_USE_DOXYGEN; then cat <<EOS
 %if ! 0%{?centos}
 BuildRequires: mscgen
+%if ! 0%{?mageia}
+BuildRequires: pandoc
+%endif
 %endif
 EOS
     fi
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 9172665..6541cbf 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -296,15 +296,15 @@ EOF
             LSB_RELEASE=/usr/bin/lsb_release
         fi
         docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget $LSB_RELEASE
+        if docker exec ${DOCKER_ID} test -x /usr/bin/dnf; then
+            docker exec ${DOCKER_ID} dnf install -y 'dnf-command(config-manager)'
+        fi
         i=0
         for key in "${keys[@]}"; do
-            wget -Orpm-key "$key"
+            docker exec -i ${DOCKER_ID} wget -Orpm-key "$key"
             docker exec -i ${DOCKER_ID} rpm --import rpm-key
-            rm rpm-key
+            docker exec -i ${DOCKER_ID} rm rpm-key
         done
-        if docker exec ${DOCKER_ID} test -x /usr/bin/dnf; then
-            docker exec ${DOCKER_ID} dnf install -y 'dnf-command(config-manager)'
-        fi
         for repo in "${repos[@]}"; do
             INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo false))
             ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
diff --git a/libxml-cxx.spec.in b/libxml-cxx.spec.in
index 229e605..6ef3354 100644
--- a/libxml-cxx.spec.in
+++ b/libxml-cxx.spec.in
@@ -7,7 +7,7 @@ Group: Development/Libraries/C++
 
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: which, pkgconfig, pandoc, gnupg, expect, subversion, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, cppunit-devel, doxygen, graphviz, java-openjdk  @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@
+BuildRequires: which, pkgconfig, gnupg, expect, subversion, make, automake, autoconf, rpm-build, binutils-devel, gcc-c++, cppunit-devel, doxygen, graphviz, java-openjdk  @RPM_BUILD_DEPEND@ @RPM_DEPEND_IFEXISTS@
 
 #### os dependent definitions ####
 %if 0%{?suse_version} || 0%{?sles_version}
@@ -24,6 +24,9 @@ BuildRequires: rpm-sign, redhat-lsb
 %endif
 %if ! 0%{?centos}
 BuildRequires: mscgen
+%if ! 0%{?mageia}
+BuildRequires: pandoc
+%endif
 %endif
 %if 0%{?mageia}
 BuildRequires: libtool, libltdl-devel