development/webtester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix fedora / centos build

Browse Source
This commit is contained in:
Marc Wäckerlin
2017-06-14 16:04:58 +00:00
parent 8ee853a812
commit 23240097ee
9 changed files with 71 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bootstrap.sh
View File

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