From 3a687a70d6d305631bfd564784a00f9e3f1e2907 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Jan 16 2017 09:07:08 +0000 Subject: - Build with qtwebkit on platforms where qtwebengine is not available --- diff --git a/bibletime-2.11.0-webengine.patch b/bibletime-2.11.0-webengine.patch new file mode 100644 index 0000000..f81ce44 --- /dev/null +++ b/bibletime-2.11.0-webengine.patch @@ -0,0 +1,16 @@ +diff -up bibletime-2.11.0/CMakeLists.txt.webengine bibletime-2.11.0/CMakeLists.txt +--- bibletime-2.11.0/CMakeLists.txt.webengine 2017-01-15 22:12:29.655271244 +0100 ++++ bibletime-2.11.0/CMakeLists.txt 2017-01-15 22:13:12.595271244 +0100 +@@ -150,12 +150,6 @@ IF("${BIBLETIME_FRONTEND}" STREQUAL "MOB + ADD_DEFINITIONS("-DBT_MOBILE") + ENDIF() + +-IF(Qt5Core_VERSION VERSION_LESS 5.6.0) +- SET(USEWEBENGINE OFF) +-ELSE() +- SET(USEWEBENGINE ON) +-ENDIF() +- + IF(USEWEBENGINE) + ADD_DEFINITIONS("-DUSEWEBENGINE") + ENDIF() diff --git a/bibletime.spec b/bibletime.spec index 2c91b90..092fe71 100644 --- a/bibletime.spec +++ b/bibletime.spec @@ -1,10 +1,11 @@ Name: bibletime Version: 2.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An easy to use Bible study tool License: GPLv2 URL: http://www.bibletime.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz +Patch0: %{name}-2.11.0-webengine.patch BuildRequires: boost-devel BuildRequires: clucene-core-devel >= 2.0 BuildRequires: cmake @@ -16,12 +17,13 @@ BuildRequires: pkgconfig(QtGui) >= 4.5.0 BuildRequires: sword-devel >= 1.7.0 BuildRequires: qt5-qtbase-devel BuildRequires: qt5-linguist +%ifarch %{qt5_qtwebengine_arches} BuildRequires: qt5-qtwebengine-devel +%else +BuildRequires: qt5-qtwebkit-devel +%endif BuildRequires: qt5-qtsvg-devel -ExcludeArch: ppc64le -ExcludeArch: ppc64 - %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} %description @@ -33,11 +35,18 @@ the SWORD Bible Framework. %prep %setup -q +%patch0 -p1 %build mkdir -p %{_target_platform} pushd %{_target_platform} -%cmake -DCMAKE_BUILD_TYPE=Release .. +%cmake -DCMAKE_BUILD_TYPE=Release \ +%ifarch %{qt5_qtwebengine_arches} + -DUSEWEBENGINE=ON \ +%else + -DUSEWEBENGINE=OFF \ +%endif + .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -80,7 +89,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop %{_datadir}/icons/%{name}.svg %changelog -* Tue Jan 10 2017 Greg Hellings - 2.11.0 +* Mon Jan 16 2017 Dan Horák - 2.11.0-2 +- Build with qtwebkit on platforms where qtwebengine is not available + +* Tue Jan 10 2017 Greg Hellings - 2.11.0-1 - New upstream release - Moved LICENSE file to license macro - Added the name macro in a few file paths