The package rpms/bibletime.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/bibletime.git/commit/?id=237c641f512....
Change: -%ifarch %{qt5_qtwebengine_arches}
Thanks.
Full change: ============
commit 237c641f5122a33a355fc4017ac05cc6d1d3cdad Author: Greg Hellings greg.hellings@gmail.com Date: Mon Aug 3 23:31:46 2020 -0400
Upstream BibleTime 3.0
diff --git a/.gitignore b/.gitignore index 495deab..2cc06ca 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ bibletime-2.7.tar.gz /bibletime-2.11.0.tar.xz /bibletime-2.11.1.tar.xz /bibletime-2.11.2.tar.xz +/bibletime-3.0.tar.xz diff --git a/bibletime.spec b/bibletime.spec index ba79ef6..1686378 100644 --- a/bibletime.spec +++ b/bibletime.spec @@ -1,22 +1,23 @@ Name: bibletime -Version: 2.11.2 -Release: 8%{?dist} +Version: 3.0 +Release: 1%{?dist} Summary: An easy to use Bible study tool License: GPLv2 URL: http://www.bibletime.info/ Source0: http://downloads.sourceforge.net/%%7Bname%7D/%%7Bname%7D-%%7Bversion%7D.tar.... BuildRequires: gcc-c++ -BuildRequires: boost-devel BuildRequires: clucene-core-devel >= 2.0 BuildRequires: cmake -BuildRequires: dbus-devel BuildRequires: desktop-file-utils -BuildRequires: gettext BuildRequires: openssl-devel BuildRequires: pkgconfig(QtGui) >= 4.5.0 BuildRequires: sword-devel >= 1.8.1-15 BuildRequires: qt5-qtbase-devel BuildRequires: qt5-linguist +BuildRequires: po4a +BuildRequires: libxslt +BuildRequires: fop +BuildRequires: docbook-style-xsl %ifarch %{qt5_qtwebengine_arches} BuildRequires: qt5-qtwebengine-devel %else @@ -24,8 +25,6 @@ BuildRequires: qt5-qtwebkit-devel %endif BuildRequires: qt5-qtsvg-devel
-Patch0: qtwebengine_header_renames.patch - %description BibleTime is a free and easy to use cross-platform bible study tool. It provides easy handling of digitalized texts (Bibles, commentaries and @@ -36,19 +35,8 @@ the SWORD Bible Framework. %prep %setup -q
-%patch0 -b .qtwebengine -p1 - %build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%cmake -DCMAKE_BUILD_TYPE=Release \ -%ifarch %{qt5_qtwebengine_arches} - -DUSEWEBENGINE=ON \ -%else - -DUSEWEBENGINE=OFF \ -%endif - .. -popd +%cmake -DCMAKE_BUILD_TYPE=Release -B %{_target_platform}
make %{?_smp_mflags} -C %{_target_platform}
@@ -56,40 +44,51 @@ make %{?_smp_mflags} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# rename wrongly-named locale -mv %{buildroot}%{_datadir}/%{name}/locale/bibletime_ui_pt_{br,BR}.qm || : -mv %{buildroot}%{_datadir}/%{name}/docs/howto/pt-{br,BR} || : +mv %{buildroot}%{_docdir}/%{name}/handbook/html/{br,BR} || : +mv %{buildroot}%{_docdir}/%{name}/handbook/pdf/{br,BR} || : +mv %{buildroot}%{_docdir}/%{name}/howto/html/{br,BR} || : +mv %{buildroot}%{_docdir}/%{name}/howto/pdf/{br,BR} || :
# locale's %find_lang %{name} || touch %{name}.lang -BT_DOC_DIR=%{_datadir}/%{name}/docs +BT_DOC_DIR=%{_docdir}/%{name}/ for doctype in handbook howto ; do - for lang_dir in %{buildroot}/$BT_DOC_DIR/$doctype/* ; do - lang=$(basename $lang_dir) - echo "%lang($lang) $BT_DOC_DIR/$doctype/$lang/*" >> %{name}.lang - done + for fmt in html pdf; do + for lang_dir in %{buildroot}/$BT_DOC_DIR/$doctype/$fmt/* ; do + lang=$(basename $lang_dir) + echo "%lang($lang) $BT_DOC_DIR/$doctype/$fmt/$lang/*" >> %{name}.lang + done + done done
%check -desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/info.%{name}.BibleTime.desktop
%files -f %{name}.lang %doc ChangeLog README.md %license LICENSE +%license %{_docdir}/%{name}/license/license.html %{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop +# This one has been reported to upstream: #260 +%{_bindir}/DisplayView.qml +%{_datadir}/applications/info.%{name}.BibleTime.desktop %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/docs/ -%dir %{_datadir}/%{name}/docs/handbook/ -%dir %{_datadir}/%{name}/docs/howto/ +%dir %{_docdir}/%{name}/handbook/ +%dir %{_docdir}/%{name}/howto/ %{_datadir}/%{name}/display-templates/ %{_datadir}/%{name}/icons/ -%{_datadir}/%{name}/javascript/ %{_datadir}/%{name}/license/ %{_datadir}/%{name}/locale/ %{_datadir}/%{name}/pics/ -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/metainfo/info.%{name}.BibleTime.metainfo.xml +%{_datadir}/icons/hicolor/scalable/apps/info.%{name}.BibleTime.svg
%changelog +* Sun Aug 02 2020 Greg Hellings greg.hellings@gmail.com - 3.0-1 +- Upstream release 3.0 +- Drop patch +- Adjust BRs for 3.0 + * Sat Aug 01 2020 Fedora Release Engineering releng@fedoraproject.org - 2.11.2-8 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/qtwebengine_header_renames.patch b/qtwebengine_header_renames.patch deleted file mode 100644 index fd07fb4..0000000 --- a/qtwebengine_header_renames.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/frontend/btwebenginepage.h b/src/frontend/btwebenginepage.h -index ad2a9f8..754bc53 100644 ---- a/src/frontend/btwebenginepage.h -+++ b/src/frontend/btwebenginepage.h -@@ -13,7 +13,7 @@ - #define BTWEBENGINEPAGE_H - - #ifdef USEWEBENGINE --#include <QWebEnginePage> -+#include <QtWebEngineWidgets> - #else - #include <QWebPage> - #include <QWebFrame> -diff --git a/src/frontend/btwebengineview.h b/src/frontend/btwebengineview.h -index 75f52b5..ab3b7bb 100644 ---- a/src/frontend/btwebengineview.h -+++ b/src/frontend/btwebengineview.h -@@ -15,7 +15,7 @@ - #include "frontend/btwebenginepage.h" - - #ifdef USEWEBENGINE --#include <QWebEngineView> -+#include <QtWebEngineWidgets> - #else - #include <QWebView> - #endif -diff --git a/src/frontend/display/bthtmlreaddisplay.cpp b/src/frontend/display/bthtmlreaddisplay.cpp -index fe1ae8c..d7f890d 100644 ---- a/src/frontend/display/bthtmlreaddisplay.cpp -+++ b/src/frontend/display/bthtmlreaddisplay.cpp -@@ -27,11 +27,6 @@ - #include "util/btconnect.h" - #include "util/directory.h" - --#ifdef USEWEBENGINE --#include <QWebEngineScript> --#include <QWebEngineScriptCollection> --#endif -- - using namespace InfoDisplay; - - #ifdef USEWEBENGINE diff --git a/sources b/sources index 6100c83..a24de45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bibletime-2.11.2.tar.xz) = 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31 +SHA512 (bibletime-3.0.tar.xz) = 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
arch-excludes@lists.fedoraproject.org