From 825e923cbedabcb4416868e5d707667bcf225155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 15 Jun 2017 06:54:58 +0000
Subject: [PATCH] fix fedora / centos build

---
 COPYING                     |  2 +-
 INSTALL                     |  2 +-
 ax_init_standard_project.m4 | 26 ++++++++++++++++++++++++++
 bootstrap.sh                |  7 +++++--
 build-in-docker.conf        |  5 ++++-
 build-in-docker.sh          |  8 +++++++-
 libpcscxx.spec.in           |  2 +-
 7 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/COPYING b/COPYING
index caeca07..2fcb217 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.14/COPYING
\ No newline at end of file
+/usr/share/automake-1.13/COPYING
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
index f812f5a..8b641e3 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.14/INSTALL
\ No newline at end of file
+/usr/share/automake-1.13/INSTALL
\ No newline at end of file
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 9fdb16c..bbbd850 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -456,6 +456,12 @@ AC_DEFUN([AX_USE_NODEJS], [
                          [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
   AC_CONFIG_FILES([nodejs/package.json])
   AC_CONFIG_FILES([nodejs/makefile])
+  if test -z "${DEB_SECTION}"; then
+    AX_DEB_SECTION([web])
+  fi
+  if test -z "${RPM_GROUP}"; then
+    AX_RPM_GROUP([Applications/Internet])
+  fi
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-nodejs-targets], [nodejs/makefile.in])
   test -f nodejs/makefile.in && cat >> nodejs/makefile.in <<EOF
 #### Begin: Appended by $0
@@ -494,6 +500,12 @@ EOF
 # use this in configure.ac to support HTML data for webservers
 AC_DEFUN([AX_BUILD_HTML], [
   AC_CONFIG_FILES([html/makefile])
+  if test -z "${DEB_SECTION}"; then
+    AX_DEB_SECTION([web])
+  fi
+  if test -z "${RPM_GROUP}"; then
+    AX_RPM_GROUP([Applications/Internet])
+  fi
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-html-targets], [html/makefile.in])
   test -f html/makefile.in && cat >> html/makefile.in <<EOF
 #### Begin: Appended by $0
@@ -521,6 +533,12 @@ AC_DEFUN([AX_USE_LIBTOOL], [
   AC_SUBST(LIB_VERSION)
   AC_PROG_LIBTOOL
   AC_CONFIG_FILES([src/${PACKAGE_NAME}.pc])
+  if test -z "${DEB_SECTION}"; then
+    AX_DEB_SECTION([devel])
+  fi
+  if test -z "${RPM_GROUP}"; then
+    AX_RPM_GROUP([Development/Libraries])
+  fi
   AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-libtool-pkg], [src/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-data-am], [src/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([uninstall-data-am], [uninstall-data-libtool-pkg], [src/makefile.in])
@@ -538,7 +556,11 @@ EOF
 ])
 
 # use this in configure.ac to support debian packages
+#  - $1: optional debian package section
 AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
+  if test -n "$1"; then
+    AX_DEB_SECTION([$1])
+  fi
   if test -f README.md; then
     README_DEB=$(tail -n +3 README.md | sed -e 's/^ *$/./g' -e 's/^/ /g')
   else
@@ -563,7 +585,11 @@ EOF
 ])
 
 # use this in configure.ac to support RPM packages
+#  - $1: optional rpm package group
 AC_DEFUN([AX_USE_RPM_PACKAGING], [
+  if test -n "$1"; then
+    AX_RPM_GROUP([$1])
+  fi
   AC_CONFIG_FILES([${PACKAGE_NAME}.spec])
   #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
diff --git a/bootstrap.sh b/bootstrap.sh
index c038fd3..fbc2814 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1635,12 +1635,12 @@ BuildRequires: which, pkgconfig, gnupg, expect, ${VCSDEPENDS_RPM}make, automake,
 %if 0%{?suse_version} || 0%{?sles_version}
 BuildRequires: lsb-release$(
     if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
-      echo -n ", qt-devel, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel";
+      echo -n ", libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel libqt5-qtwebengine-devel libQt5WebKitWidgets-devel";
     fi)
 %else
 $(
     if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT; then
-      echo -n "BuildRequires: qt-devel, qt5-qtbase-devel, qt5-qttools-devel, qtwebkit-devel";
+      echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel";
     fi)
 %if  0%{?mageia}
 BuildRequires: rpm-sign, lsb-release
@@ -1824,6 +1824,9 @@ repos+=("ubuntu:::universe")
 # Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
 repos+=("debian|ubuntu:::https://dev.marc.waeckerlin.org/repository:::https://dev.marc.waeckerlin.org/repository/@DISTRIBUTOR@/marc-waeckerlin.repo")
 keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
+
+# centos requires epel-release for some packages, such as Qt WebKit
+packages+=("centos:::epel-release")
 EOF
 
 #### Cleanup If Makefile Exists ####
diff --git a/build-in-docker.conf b/build-in-docker.conf
index 75ec425..facd0a7 100644
--- a/build-in-docker.conf
+++ b/build-in-docker.conf
@@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Fri, 02 June 2017 14:11:41 +0200
+##  -  on Wed, 14 June 2017 16:00:28 +0200
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
@@ -14,3 +14,6 @@ repos+=("ubuntu:::universe")
 # Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
 repos+=("debian|ubuntu:::https://dev.marc.waeckerlin.org/repository:::https://dev.marc.waeckerlin.org/repository/@DISTRIBUTOR@/marc-waeckerlin.repo")
 keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
+
+# centos requires epel-release for some packages, such as Qt WebKit
+packages+=("centos:::epel-release")
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 4de62d7..161351a 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -90,7 +90,7 @@ while test $# -gt 0; do
                     img="mwaeckerlin/ubuntu:latest"; host="${host:---host=i686-w64-mingw32}"
                     targets="all install"
                     flags+=("--prefix=/workdir/usr")
-                    packages1=("mingw-w64")
+                    packages+=("mingw-w64")
                     ;;
                 (*)
                     echo "**** ERROR: unknown mode '$1', try --help" 1>&2
@@ -300,6 +300,12 @@ EOF
             ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
             ((++i))
         done
+        for package in "${packages[@]}"; do
+            ifthenelse "${package}" "${INSTALL_TOOL} ARG"
+        done
+        for command in "${commands[@]}"; do
+            ifthenelse "${command}" "ARG"
+        done
         docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh
         ;;
 esac
diff --git a/libpcscxx.spec.in b/libpcscxx.spec.in
index aee9bd2..9e524b8 100644
--- a/libpcscxx.spec.in
+++ b/libpcscxx.spec.in
@@ -13,7 +13,7 @@ BuildRequires: which, pkgconfig, gnupg, expect, subversion, make, automake, auto
 %if 0%{?suse_version} || 0%{?sles_version}
 BuildRequires: lsb-release, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel
 %else
-BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qtwebkit-devel
+BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, qt5-qtwebkit-devel
 %if  0%{?mageia}
 BuildRequires: rpm-sign, lsb-release
 %else