From 8fc81dc445331f99b3538de29f3e3ff4bea3eb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Fri, 22 Jun 2018 14:45:49 +0000
Subject: [PATCH] fixed rpm build

---
 bootstrap.sh            | 10 +++++++---
 libxml-cxx.spec.in      | 12 +++++-------
 resolve-rpmbuilddeps.sh |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index cfa5546..90f48d1 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1700,13 +1700,17 @@ BuildRequires: lsb-release$(
       echo -n ", libqt5-qtbase-devel, libqt5-qttools, libqt5-linguist-devel, libQt5WebKit5-devel libqt5-qtwebengine-devel libQt5WebKitWidgets-devel";
     fi)
 %else
+%if  0%{?mageia}
+BuildRequires: rpm-sign, lsb-release
 $(
     if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
-      echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel";
+      echo -n "BuildRequires: qtbase5-common-devel, qttools5, lib64qt5webkit-devel, lib64qt5webkitwidgets-devel";
     fi)
-%if  0%{?mageia}
-BuildRequires: rpm-sign, lsb-release
 %else
+$(
+    if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
+      echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel";
+    fi)
 BuildRequires: rpm-sign, redhat-lsb
 %global debug_package %{nil}
 %endif
diff --git a/libxml-cxx.spec.in b/libxml-cxx.spec.in
index aa5a1f6..229e605 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, 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, 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@
 
 #### os dependent definitions ####
 %if 0%{?suse_version} || 0%{?sles_version}
@@ -15,8 +15,11 @@ BuildRequires: lsb-release
 %else
 %if  0%{?mageia}
 BuildRequires: rpm-sign, lsb-release
+
 %else
+
 BuildRequires: rpm-sign, redhat-lsb
+%global debug_package %{nil}
 %endif
 %endif
 %if ! 0%{?centos}
@@ -55,12 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%_lib/*.so.*
 
 %doc
-/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
-/usr/share/doc/packages/@PACKAGE_NAME@/COPYING
-/usr/share/doc/packages/@PACKAGE_NAME@/ChangeLog
-/usr/share/doc/packages/@PACKAGE_NAME@/INSTALL
-/usr/share/doc/packages/@PACKAGE_NAME@/NEWS
-/usr/share/doc/packages/@PACKAGE_NAME@/README
+/usr/share/doc
 
 %package devel
 Summary: @DESCRIPTION@
diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh
index 7c1843b..56bfd4f 100755
--- a/resolve-rpmbuilddeps.sh
+++ b/resolve-rpmbuilddeps.sh
@@ -97,12 +97,12 @@ fi
 
 if test -n "${SCHROOTNAME}"; then
     FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
-    if test -n "${FILES}"; then
+    if test -n "${FILES}${DEPS}"; then
         schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL}  ${FILES} ${DEPS}
     fi
 else
     FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
-    if test -n "${FILES}"; then
+    if test -n "${FILES}${DEPS}"; then
         ${INSTALL_TOOL} ${FILES} ${DEPS}
     fi
 fi