From 23240097eea474be47025542a9b18b9015ec4d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 14 Jun 2017 16:04: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 | 12 ++++++------ build-in-docker.sh | 8 +++++++- configure.ac | 6 +++--- makefile.am | 25 ++++++++++++++++++++----- webtester.spec.in | 4 ++-- 9 files changed, 71 insertions(+), 21 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 02602ee..c05a634 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 <> html/makefile.in <&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/configure.ac b/configure.ac index 1d909a9..6e6f920 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ AX_USE_CXX #AX_USE_LIBTOOL AX_USE_SCRIPTS AX_USE_DOXYGEN -AX_USE_DEBIAN_PACKAGING -AX_USE_RPM_PACKAGING +AX_USE_DEBIAN_PACKAGING([utils]) +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 diff --git a/makefile.am b/makefile.am index b9c8338..e7445aa 100644 --- a/makefile.am +++ b/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 -# Feel free to change it or even remove and rebuild it, up to your needs -# +## +## This file has been added: +## - 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 diff --git a/webtester.spec.in b/webtester.spec.in index 0da8c91..8e3d83e 100644 --- a/webtester.spec.in +++ b/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