fix fedora / centos build

COPYING

@@ -1 +1 @@
-/usr/share/automake-1.14/COPYING
+/usr/share/automake-1.13/COPYING

INSTALL

@@ -1 +1 @@
-/usr/share/automake-1.14/INSTALL
+/usr/share/automake-1.13/INSTALL

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])

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 ####

build-in-docker.conf

@@ -2,18 +2,18 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Fri, 20 January 2017 11:56:47 +0100
+##  -  on Wed, 14 June 2017 13:55:22 +0200
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
 # Use Ubuntu Universe Repository
-repos+=("Ubuntu:::universe")
+repos+=("ubuntu:::universe")
 
 # Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
-repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
+repos+=("debian|ubuntu:::https://dev.marc.waeckerlin.org/repository:::https://dev.marc.waeckerlin.org/repository/@DISTRIBUTOR@/marc-waeckerlin.repo")
-repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
-repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
-repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/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")

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

configure.ac

@@ -22,8 +22,8 @@ AX_USE_CXX
 #AX_USE_LIBTOOL
 AX_USE_SCRIPTS
 AX_USE_DOXYGEN
-AX_USE_DEBIAN_PACKAGING
+AX_USE_DEBIAN_PACKAGING([utils])
-AX_USE_RPM_PACKAGING
+AX_USE_RPM_PACKAGING([Development/Tools])
 #AX_USE_CPPUNIT
 AX_BUILD_TEST
 #AX_BUILD_EXAMPLES
@@ -44,4 +44,4 @@ AX_PKG_REQUIRE([xmlcxx], [libxml-cxx])
 AC_CHECK_HEADERS([cxxabi.h])
 
 # create output
-AC_OUTPUT
+AX_OUTPUT

makefile.am

@@ -1,9 +1,24 @@
 ## @id $Id$
-#
+##
-# This file has been added by bootstrap.sh on Wed, 06 May 2015 16:20:18 +0200
+## This file has been added:
-# Feel free to change it or even remove and rebuild it, up to your needs
+##  - by bootstrap.sh
-#
+##  -  on Wed, 14 June 2017 13:33:26 +0200
+## Feel free to change it or even remove and rebuild it, up to your needs
+##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-SUBDIRS = src scripts doc test
+SUBDIRS = src test scripts doc
+
+desktopdir = ${datadir}/applications
+desktop_DATA = @PACKAGE_DESKTOP@
+dist_pkgdata_DATA = @PACKAGE_ICON@ ax_check_qt.m4 bootstrap.sh		\
+                    resolve-rpmbuilddeps.sh autogen.sh			\
+                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\
+                    build-resource-file.sh				\
+                    ax_init_standard_project.m4				\
+                    mac-create-app-bundle.sh resolve-debbuilddeps.sh    \
+                    sql-to-dot.sed
+dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+
+MAINTAINERCLEANFILES = makefile.in

webtester.spec.in

@@ -11,9 +11,9 @@ BuildRequires: which, pkgconfig, gnupg, expect, subversion, make, automake, auto
 
 #### os dependent definitions ####
 %if 0%{?suse_version} || 0%{?sles_version}
-BuildRequires: lsb-release, qt-devel, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel
+BuildRequires: lsb-release, libqt5-qtbase-devel, libqt5-qttools, libQt5WebKit5-devel libqt5-qtwebengine-devel libQt5WebKitWidgets-devel
 %else
-BuildRequires: qt-devel, 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