diff --git a/.gitignore b/.gitignore index 3266caa..7714ccf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ /zeal-0.6.1.tar.gz /zeal-dbb8eb2.tar.gz /zeal-00d4b9c.tar.gz -/zeal-1cfa7c637f745be9d98777f06b4f8dec90892bf2.tar.gz -/zeal-1cfa7c6.tar.gz -/zeal-0.7.0.tar.gz -/zeal-0.7.1.tar.gz -/zeal-0.7.2.tar.gz -/zeal-0.8.0.tar.gz -/zeal-0.8.1.tar.gz diff --git a/README.packit b/README.packit deleted file mode 100644 index ef3579c..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.15.2.post1.dev4+g26d226709. diff --git a/changelog b/changelog deleted file mode 100644 index 1547899..0000000 --- a/changelog +++ /dev/null @@ -1,115 +0,0 @@ -* Sun Sep 24 2023 Lumír Balhar - 0.7.0-1 -- Update to 0.7.0 (rhbz#2240281) - -* Wed Jul 26 2023 Björn Esser - 0.6.2-5.20230618.1cfa7c6 -- Rebuild(qt6) - -* Sat Jul 22 2023 Fedora Release Engineering - 0.6.2-4.20230618.1cfa7c6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 17 2023 Lumír Balhar - 0.6.2-3.20230618.1cfa7c6 -- Rebuild - -* Sun Jun 18 2023 Lumír Balhar - 0.6.2-2.20230618.1cfa7c6 -- Don't use obsoleted forge macros - -* Sat Jun 10 2023 Zephyr Lykos - 0.6.2-1.git1cfa7c6 -- Update to commit 1cfa7c6 -- Migrate to Qt 6 -- Use forge macros -- Deprecate versioned cmake macros -- Clean up BuildRequires -- Reflect the actual version written in CMakeLists.txt - -* Sat Jan 21 2023 Fedora Release Engineering - 0.6.1-14.20220826.00d4b9c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Aug 26 2022 Lumír Balhar - 0.6.1-13.20220826.00d4b9c -- Update to commit 00d4b9c - -* Sat Jul 23 2022 Fedora Release Engineering - 0.6.1-12.20200821.dbb8eb2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.6.1-11.20200821.dbb8eb2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Aug 21 2021 Lumír Balhar - 0.6.1-10.20210821.dbb8eb2 -- Package the latest version from master branch to fix segfaults - -* Fri Jul 23 2021 Fedora Release Engineering - 0.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Feb 02 2021 Lumír Balhar - 0.6.1-8 -- Fix build on rawhide -Resolves: rhbz#1923599 - -* Thu Jan 28 2021 Fedora Release Engineering - 0.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Aug 20 2019 Lumír Balhar - 0.6.1-4 -- Disable ads on the welcome page by default - -* Sat Jul 27 2019 Fedora Release Engineering - 0.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 30 2019 Lumír Balhar - 0.6.1-2 -- Specfile improved - -* Wed Nov 7 2018 Michel Alexandre Salim - 0.6.1-1 -- Update to 0.6.1 - -* Fri Aug 24 2018 Michel Alexandre Salim - 0.6.0-1 -- Update to 0.6.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 0.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Jan 21 2018 Michel Alexandre Salim - 0.5.0-3 -- Fix missing dependency on libCore.so - don't build Zeal with shared libs flag - -* Thu Jan 18 2018 Igor Gnatenko - 0.5.0-2 -- Remove obsolete scriptlets - -* Tue Jan 16 2018 Michel Alexandre Salim - 0.5.0-1 -- Update to 0.5.0 -- Switch to cmake; upstream is deprecating qmake -- and its rule for detecting Qt >= 5.5.1 breaks on F28's Qt 5.10 - -* Mon Sep 4 2017 Michel Alexandre Salim - 0.4.0-1 -- Update to 0.4.0 - -* Thu Aug 03 2017 Fedora Release Engineering - 0.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Oct 12 2016 Michel Alexandre Salim - 0.3.1-1 -- Update to 0.3.1 - -* Sat Sep 24 2016 Michel Alexandre Salim - 0.3.0-1 -- Update to 0.3.0 - -* Mon Feb 22 2016 Michel Alexandre Salim - 0.2.1-1 -- Update to 0.2.1 - -* Fri Feb 05 2016 Fedora Release Engineering - 0.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 14 2015 Michel Salim - 0.1.1-2 -- Update license info, add bundled lib metadata - -* Thu Sep 24 2015 Michel Alexandre Salim - 0.1.1-1 -- Initial package diff --git a/packit.yaml b/packit.yaml deleted file mode 100644 index fdf84eb..0000000 --- a/packit.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -copy_upstream_release_description: false - -jobs: -- job: pull_from_upstream - trigger: release - dist_git_branches: - - fedora-rawhide - -- job: koji_build - trigger: commit - allowed_committers: ['packit'] - dist_git_branches: - - fedora-rawhide diff --git a/sources b/sources index de702f8..c76ec35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeal-0.8.1.tar.gz) = fcca8b5e84801bbbab43832d60347bb3d17f3e83d35893cedd3f3ca98588ea7b91fad8c9602edd96bebaa56ceedbc2146f48b3c394b69e5028a200162ee2787c +SHA512 (zeal-00d4b9c.tar.gz) = 25c272a14829994e6caf09f0942cd3e946afbc8721b51468dfa1c15938a597993d652d2072007d962299de5ae4e2922e23b31788b90933a93febcd631a4567c4 diff --git a/zeal.spec b/zeal.spec index 6858f04..d880f07 100644 --- a/zeal.spec +++ b/zeal.spec @@ -1,38 +1,32 @@ +%global commit 00d4b9ca5bf4588629939cca9d602a3dbd6a8525 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global debug_package %{nil} + Name: zeal -Version: 0.8.1 -Release: %autorelease +Version: 0.6.1 +Release: 13.20220826.%{shortcommit}%{?dist} Summary: Offline documentation browser inspired by Dash -License: GPL-3.0-or-later +License: GPLv3+ URL: https://zealdocs.org/ -Source: https://github.com/zealdocs/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/zealdocs/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz -ExclusiveArch: %{qt6_qtwebengine_arches} +# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches +ExclusiveArch: %{qt5_qtwebengine_arches} -BuildRequires: cmake(Qt6Core) >= 6.2.0 -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6Widgets) -BuildRequires: cmake(Qt6WebEngineWidgets) -BuildRequires: cmake(Qt6WebChannel) -BuildRequires: cmake(Qt6Network) - -BuildRequires: pkgconfig(libarchive) -BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcb-keysyms) - -BuildRequires: cmake -BuildRequires: extra-cmake-modules -BuildRequires: ninja-build -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: qt6-qtbase-private-devel +BuildRequires: cmake3 +BuildRequires: cmake(Qt5) +BuildRequires: cmake(Qt5WebKit) +BuildRequires: cmake(Qt5X11Extras) BuildRequires: desktop-file-utils +BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros +BuildRequires: gcc-c++ BuildRequires: libappstream-glib - -%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: libarchive-devel +BuildRequires: sqlite-devel +BuildRequires: xcb-util-keysyms-devel +BuildRequires: qt5-qtwebengine-devel Requires: hicolor-icon-theme %description @@ -40,20 +34,24 @@ Zeal is a simple offline documentation browser inspired by Dash. %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{commit} +# Disable ads on the welcome page +# Ads will be removed in 0.7.x +sed -i 's/("disable_ad"), false/("disable_ad"), true/' src/libs/core/settings.cpp %build # turn off shared libs building: # - it's only used from Zeal itself # - build scripts not configured to install the lib -%cmake_qt6 \ - -DBUILD_SHARED_LIBS:BOOL=OFF -%cmake_build +%cmake_kf5 \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + %{nil} +%cmake3_build %install -%cmake_install +%cmake3_install %check @@ -63,7 +61,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %files %license COPYING -%doc README.md CHANGELOG.md +%doc README.md %{_bindir}/%{name} %{_datadir}/applications/org.zealdocs.zeal.desktop %{_metainfodir}/org.zealdocs.zeal.appdata.xml @@ -71,4 +69,92 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.zealdocs.z %changelog -%autochangelog +* Fri Aug 26 2022 Lumír Balhar - 0.6.1-13.20220826.00d4b9c +- Update to commit 00d4b9c + +* Sat Jul 23 2022 Fedora Release Engineering - 0.6.1-12.20200821.dbb8eb2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.6.1-11.20200821.dbb8eb2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Aug 21 2021 Lumír Balhar - 0.6.1-10.20210821.dbb8eb2 +- Package the latest version from master branch to fix segfaults + +* Fri Jul 23 2021 Fedora Release Engineering - 0.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Feb 02 2021 Lumír Balhar - 0.6.1-8 +- Fix build on rawhide +Resolves: rhbz#1923599 + +* Thu Jan 28 2021 Fedora Release Engineering - 0.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Aug 20 2019 Lumír Balhar - 0.6.1-4 +- Disable ads on the welcome page by default + +* Sat Jul 27 2019 Fedora Release Engineering - 0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 30 2019 Lumír Balhar - 0.6.1-2 +- Specfile improved + +* Wed Nov 7 2018 Michel Alexandre Salim - 0.6.1-1 +- Update to 0.6.1 + +* Fri Aug 24 2018 Michel Alexandre Salim - 0.6.0-1 +- Update to 0.6.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 0.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 21 2018 Michel Alexandre Salim - 0.5.0-3 +- Fix missing dependency on libCore.so - don't build Zeal with shared libs flag + +* Thu Jan 18 2018 Igor Gnatenko - 0.5.0-2 +- Remove obsolete scriptlets + +* Tue Jan 16 2018 Michel Alexandre Salim - 0.5.0-1 +- Update to 0.5.0 +- Switch to cmake; upstream is deprecating qmake +- and its rule for detecting Qt >= 5.5.1 breaks on F28's Qt 5.10 + +* Mon Sep 4 2017 Michel Alexandre Salim - 0.4.0-1 +- Update to 0.4.0 + +* Thu Aug 03 2017 Fedora Release Engineering - 0.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Oct 12 2016 Michel Alexandre Salim - 0.3.1-1 +- Update to 0.3.1 + +* Sat Sep 24 2016 Michel Alexandre Salim - 0.3.0-1 +- Update to 0.3.0 + +* Mon Feb 22 2016 Michel Alexandre Salim - 0.2.1-1 +- Update to 0.2.1 + +* Fri Feb 05 2016 Fedora Release Engineering - 0.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 14 2015 Michel Salim - 0.1.1-2 +- Update license info, add bundled lib metadata + +* Thu Sep 24 2015 Michel Alexandre Salim - 0.1.1-1 +- Initial package