The package rpms/zeal.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/zeal.git/commit/?id=5bd33e11a1640f9a....
Change: +ExclusiveArch: %{qt5_qtwebengine_arches}
Thanks.
Full change: ============
commit 5bd33e11a1640f9acf12a13985167e9c7b6c675a Author: Lumir Balhar lbalhar@redhat.com Date: Wed Aug 25 09:44:42 2021 +0200
Build only for arches where qtwebengine is available
diff --git a/zeal.spec b/zeal.spec index 946c167..93be3ce 100644 --- a/zeal.spec +++ b/zeal.spec @@ -11,6 +11,9 @@ License: GPLv3+ URL: https://zealdocs.org/ Source0: https://github.com/zealdocs/%%7Bname%7D/archive/%%7Bcommit%7D/%%7Bname%7D-%%...
+# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches +ExclusiveArch: %{qt5_qtwebengine_arches} + BuildRequires: cmake3 BuildRequires: cmake(Qt5) BuildRequires: cmake(Qt5WebKit)
commit 6979ad9985b0a9fedca2e00cb35778b7066872d9 Author: Lumir Balhar lbalhar@redhat.com Date: Wed Aug 25 09:32:49 2021 +0200
Update sources
diff --git a/.gitignore b/.gitignore index eaa20ec..14da3a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zeal-0.6.1.tar.gz +/zeal-dbb8eb2.tar.gz diff --git a/sources b/sources index 34d5188..652aad0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-0.6.1.tar.gz) = 5b1a129980000c0fc8516e2c7d6c4a8de4adde7054ff8d9635e3be35441ad3ef0539746bbe1ca8abce7e6fb3d20c825b57661c3f8cd059ef1480db65ff81f3d9 +SHA512 (zeal-dbb8eb2.tar.gz) = a4f5d74515491fa41fd71e2becbfa95803c3e8090a40eca2ff794fef504e37eb4bb413fb621f505f94f174446d52c2b0a9db436d453fa0c0197616f12b8e609a
commit 518fb65b2f21dc46fca74cb1ec03234c5801cdfc Author: Lumir Balhar lbalhar@redhat.com Date: Mon Aug 23 11:25:40 2021 +0200
Update to the latest master to fix segfaults
diff --git a/0001-Fix-QPainterPath.patch b/0001-Fix-QPainterPath.patch deleted file mode 100644 index 972a070..0000000 --- a/0001-Fix-QPainterPath.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 87e98e8bfef693e55761e76c09dbd9bbbe749f2d Mon Sep 17 00:00:00 2001 -From: Lumir Balhar lbalhar@redhat.com -Date: Tue, 2 Feb 2021 10:13:12 +0100 -Subject: [PATCH] Fix QPainterPath - ---- - src/libs/ui/searchitemdelegate.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libs/ui/searchitemdelegate.cpp b/src/libs/ui/searchitemdelegate.cpp -index 4bd6d0a..d8ad79b 100644 ---- a/src/libs/ui/searchitemdelegate.cpp -+++ b/src/libs/ui/searchitemdelegate.cpp -@@ -27,6 +27,7 @@ - #include <QFontMetrics> - #include <QHelpEvent> - #include <QPainter> -+#include <QPainterPath> - #include <QToolTip> - - using namespace Zeal::WidgetUi; --- -2.29.2 - diff --git a/zeal.spec b/zeal.spec index 31e49a1..946c167 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,14 +1,15 @@ +%global commit dbb8eb29db1476a7b117d96e047867577ff73261 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil}
Name: zeal Version: 0.6.1 -Release: 9%{?dist} +Release: 10.20200821.%{shortcommit}%{?dist} Summary: Offline documentation browser inspired by Dash
License: GPLv3+ URL: https://zealdocs.org/ -Source0: https://github.com/zealdocs/zeal/archive/v%%7Bversion%7D.tar.gz#/%%7Bname%7D... -Patch0: 0001-Fix-QPainterPath.patch +Source0: https://github.com/zealdocs/%%7Bname%7D/archive/%%7Bcommit%7D/%%7Bname%7D-%%...
BuildRequires: cmake3 BuildRequires: cmake(Qt5) @@ -16,11 +17,13 @@ BuildRequires: cmake(Qt5WebKit) BuildRequires: cmake(Qt5X11Extras) BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros BuildRequires: gcc-c++ BuildRequires: libappstream-glib BuildRequires: libarchive-devel BuildRequires: sqlite-devel BuildRequires: xcb-util-keysyms-devel +BuildRequires: qt5-qtwebengine-devel Requires: hicolor-icon-theme
%description @@ -28,7 +31,7 @@ Zeal is a simple offline documentation browser inspired by Dash.
%prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{commit}
# Disable ads on the welcome page # Ads will be removed in 0.7.x @@ -38,7 +41,7 @@ sed -i 's/("disable_ad"), false/("disable_ad"), true/' src/libs/core/settings.cp # turn off shared libs building: # - it's only used from Zeal itself # - build scripts not configured to install the lib -%cmake3 \ +%cmake_kf5 \ -DBUILD_SHARED_LIBS:BOOL=OFF \ %{nil} %cmake3_build @@ -49,20 +52,23 @@ sed -i 's/("disable_ad"), false/("disable_ad"), true/' src/libs/core/settings.cp
%check -desktop-file-validate %{buildroot}%{_datadir}/applications/org.zealdocs.Zeal.desktop -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.Zeal.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/org.zealdocs.zeal.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.zeal.appdata.xml
%files %license COPYING %doc README.md %{_bindir}/%{name} -%{_datadir}/applications/org.zealdocs.Zeal.desktop -%{_metainfodir}/org.zealdocs.Zeal.appdata.xml +%{_datadir}/applications/org.zealdocs.zeal.desktop +%{_metainfodir}/org.zealdocs.zeal.appdata.xml %{_datadir}/icons/hicolor/*/apps/%{name}.png
%changelog +* Sat Aug 21 2021 Lumír Balhar lbalhar@redhat.com - 0.6.1-10.20210821.dbb8eb2 +- Package the latest version from master branch to fix segfaults + * Fri Jul 23 2021 Fedora Release Engineering releng@fedoraproject.org - 0.6.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
arch-excludes@lists.fedoraproject.org