diff --git a/.gitignore b/.gitignore index 0d726f3..27a82dd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,65 +6,3 @@ /zanshin-22.04.0.tar.xz /zanshin-22.04.1.tar.xz /zanshin-22.04.1.tar.xz -/zanshin-22.04.3.tar.xz -/zanshin-22.08.0.tar.xz -/zanshin-22.08.1.tar.xz -/zanshin-22.08.2.tar.xz -/zanshin-22.08.3.tar.xz -/zanshin-22.12.0.tar.xz -/zanshin-22.12.1.tar.xz -/zanshin-22.12.2.tar.xz -/zanshin-22.12.3.tar.xz -/zanshin-23.03.80.tar.xz -/zanshin-23.03.90.tar.xz -/zanshin-23.04.0.tar.xz -/zanshin-23.04.1.tar.xz -/zanshin-23.04.2.tar.xz -/zanshin-23.04.3.tar.xz -/zanshin-23.08.0.tar.xz -/zanshin-23.08.1.tar.xz -/zanshin-23.08.2.tar.xz -/zanshin-24.01.80.tar.xz -/zanshin-24.01.85.tar.xz -/zanshin-24.01.90.tar.xz -/zanshin-24.01.95.tar.xz -/zanshin-24.02.0.tar.xz -/zanshin-24.02.1.tar.xz -/zanshin-24.02.2.tar.xz -/zanshin-24.05.0.tar.xz -/zanshin-24.05.1.tar.xz -/zanshin-24.05.2.tar.xz -/zanshin-24.08.0.tar.xz -/zanshin-24.08.1.tar.xz -/zanshin-24.08.2.tar.xz -/zanshin-24.08.3.tar.xz -/zanshin-24.11.80.tar.xz -/zanshin-24.11.90.tar.xz -/zanshin-24.12.0.tar.xz -/zanshin-24.12.1.tar.xz -/zanshin-24.12.2.tar.xz -/zanshin-24.12.3.tar.xz -/zanshin-25.03.80.tar.xz -/zanshin-25.04.0.tar.xz -/zanshin-25.04.1.tar.xz -/zanshin-25.04.2.tar.xz -/zanshin-25.04.3.tar.xz -/zanshin-25.07.80.tar.xz -/zanshin-25.07.90.tar.xz -/zanshin-25.08.0.tar.xz -/zanshin-25.08.1.tar.xz -/zanshin-25.08.2.tar.xz -/zanshin-25.08.3.tar.xz -/zanshin-25.11.80.tar.xz -/zanshin-25.11.90.tar.xz -/zanshin-25.12.0.tar.xz -/zanshin-25.12.1.tar.xz -/zanshin-25.12.2.tar.xz -/zanshin-25.12.3.tar.xz -/zanshin-26.03.80.tar.xz -/zanshin-26.04.0.tar.xz -/zanshin-26.04.1.tar.xz -/zanshin-26.04.2.tar.xz -/zanshin-26.04.3.tar.xz -/zanshin-26.07.90.tar.xz -/zanshin-26.08.0.tar.xz diff --git a/sources b/sources index 2dc0ff1..2a0a6d1 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -SHA512 (zanshin-26.08.0.tar.xz) = aebf9c29155a815b0d8526daf9d5675ae46f728de0332a1db8d12edd21f0231dd53d67a098044efcc317dc8684bad576d2672b4880c69ce346f5e902de06b051 +SHA512 (zanshin-21.12.3.tar.xz) = 0455c19401c1a3f1be061980c5d96c851f32655db55663ff6735cb39b8a20849bd95253f659517918197c9d6d6db1ee0b8ce305f249e4640b2907814b9a0441b +SHA512 (zanshin-22.04.0.tar.xz) = b9c06fab71969b06e5d731ac203335dc81c18f0729a1bd1c416500d363c0bff31cd58aa5de9f26134f59dcbd9e1a4ef5467b00de444af0e6b9502ce3c1082a30 +SHA512 (zanshin-22.04.1.tar.xz) = afec035ba7249031ba7adaf1153843ba0a17ad66ede19323b87c2d917de2c0f1b6d1652796f795977e484dc0435a8244453c6a45b29d19ffeecb4d9945bc40ef +SHA512 (zanshin-22.04.1.tar.xz) = afec035ba7249031ba7adaf1153843ba0a17ad66ede19323b87c2d917de2c0f1b6d1652796f795977e484dc0435a8244453c6a45b29d19ffeecb4d9945bc40ef diff --git a/zanshin.spec b/zanshin.spec index 9901db5..ef7b3f5 100644 --- a/zanshin.spec +++ b/zanshin.spec @@ -1,50 +1,63 @@ +# uncomment to enable bootstrap mode +#global bootstrap 1 -# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} +%if !0%{?bootstrap} +## * significantly increases build-time and there at least several failures +## ping upstream if this is expected +## * FTBFS on arm (disable for now) +#ifnarch %{arm} +#global tests 1 +#endif +%endif Name: zanshin -Version: 26.08.0 -Release: 1%{?dist} +Version: 22.04.1 +Release: 1%{?dist} Summary: Todo/action management software -License: CC0-1.0 AND GPL-2.0-only AND GPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND MIT +License: GPLv2 URL: http://zanshin.kde.org/ -Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: https://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz ## upstream patches -# handled by qt6-srpm-macros, which defines %%qt6_qtwebengine_arches -%{?qt6_qtwebengine_arches:ExclusiveArch: %{qt6_qtwebengine_arches}} +# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches +%{?qt5_qtwebengine_arches:ExclusiveArch: %{qt5_qtwebengine_arches}} BuildRequires: extra-cmake-modules BuildRequires: gettext BuildRequires: intltool -BuildRequires: cmake -BuildRequires: kf6-rpm-macros +## kf5 +BuildRequires: cmake(KF5Akonadi) +BuildRequires: cmake(KF5AkonadiCalendar) cmake(KF5AkonadiContact) +BuildRequires: cmake(KF5AkonadiNotes) +BuildRequires: cmake(KF5AkonadiSearch) +BuildRequires: cmake(KF5IdentityManagement) +BuildRequires: cmake(KF5KontactInterface) +BuildRequires: cmake(KF5Ldap) +BuildRequires: cmake(KF5Runner) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5Qml) +BuildRequires: cmake(Qt5Test) ## %%check BuildRequires: desktop-file-utils BuildRequires: libappstream-glib - -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6Widgets) -BuildRequires: cmake(Qt6Test) - +%if 0%{?tests} BuildRequires: boost-devel - -BuildRequires: cmake(KF6Runner) -BuildRequires: cmake(KF6WindowSystem) -BuildRequires: cmake(KF6I18n) -BuildRequires: cmake(KF6CalendarCore) -BuildRequires: cmake(KF6Parts) -BuildRequires: cmake(KF6Crash) - -BuildRequires: cmake(KPim6Akonadi) -BuildRequires: cmake(KPim6AkonadiCalendar) -BuildRequires: cmake(KPim6KontactInterface) -BuildRequires: cmake(KPim6IdentityManagementCore) - - +BuildRequires: dbus-x11 +BuildRequires: kf5-akonadi-server +BuildRequires: kf5-akonadi-server-devel +BuildRequires: time +BuildRequires: xorg-x11-server-Xvfb +%endif Provides: zanshin-frontend = %{version}-%{release} Requires: zanshin-common = %{version}-%{release} @@ -72,253 +85,47 @@ BuildArch: noarch %build -%cmake_kf6 +%{cmake_kf5} \ + -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} %cmake_build %install %cmake_install + %find_lang %{name} --all-name %check -appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.metainfo.xml +appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.%{name}.desktop +%if 0%{?tests} +export CTEST_OUTPUT_ON_FAILURE=1 +xvfb-run -a \ +dbus-launch --exit-with-session \ +time \ +%ctest --timeout 30 +%endif %files common -f %{name}.lang -%{_kf6_datadir}/icons/hicolor/*/*/zanshin.* +%doc AUTHORS HACKING TODO +%license LICENSES/*.txt +%{_kf5_datadir}/icons/hicolor/*/*/zanshin.* +%dir %{_kf5_datadir}/kservices5/kontact/ %files -%{_kf6_bindir}/zanshin* -%{_kf6_metainfodir}/org.kde.zanshin.metainfo.xml -%{_kf6_datadir}/applications/org.kde.zanshin.desktop -%{_qt6_plugindir}/pim6/kontact/kontact_zanshinplugin.so -%{_qt6_plugindir}/zanshin_part.so -%{_kf6_plugindir}/krunner/org.kde.%{name}.so +%{_kf5_bindir}/zanshin* +%{_kf5_metainfodir}/org.kde.zanshin.metainfo.xml +%{_kf5_datadir}/applications/org.kde.zanshin.desktop +%{_kf5_datadir}/kservices5/kontact/zanshin_plugin.desktop +%{_kf5_datadir}/kservices5/plasma-runner-zanshin.desktop +%{_kf5_datadir}/kservices5/zanshin_part.desktop +%{_kf5_datadir}/kxmlgui5/zanshin/ +%{_qt5_plugindir}/kontact5/kontact_zanshinplugin.so +%{_qt5_plugindir}/krunner_zanshin.so +%{_qt5_plugindir}/zanshin_part.so %changelog -* Fri Aug 14 2026 Steve Cossette - 26.08.0-1 -- 26.08.0 - -* Fri Jul 31 2026 Steve Cossette - 26.07.90-1 -- 26.07.90 - -* Wed Jul 29 2026 Steve Cossette - 26.07.80-1 -- 26.07.80 - -* Fri Jul 17 2026 Fedora Release Engineering - 26.04.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Tue Jun 30 2026 Steve Cossette - 26.04.3-1 -- 26.04.3 - -* Wed Jun 03 2026 Steve Cossette - 26.04.2-1 -- 26.04.2 - -* Wed May 06 2026 Steve Cossette - 26.04.1-1 -- 26.04.1 - -* Sat Apr 11 2026 Steve Cossette - 26.04.0-1 -- 26.04.0 - -* Mon Mar 16 2026 Steve Cossette - 26.03.80-1 -- 26.03.80 - -* Sun Mar 08 2026 Steve Cossette - 25.12.3-1 -- 25.12.3 - -* Thu Feb 12 2026 Steve Cossette - 25.12.2-2 -- Full Stack Rebuild (kio abi break) - -* Wed Feb 04 2026 Steve Cossette - 25.12.2-1 -- 25.12.2 - -* Sat Jan 17 2026 Fedora Release Engineering - 25.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jan 07 2026 farchord@gmail.com - 25.12.1-1 -- 25.12.1 - -* Sat Dec 06 2025 Steve Cossette - 25.12.0-1 -- 25.12.0 - -* Fri Nov 28 2025 Steve Cossette - 25.11.90-1 -- 25.11.90 - -* Sat Nov 15 2025 Steve Cossette - 25.11.80-1 -- 25.11.80 - -* Tue Nov 04 2025 Steve Cossette - 25.08.3-1 -- 25.08.3 - -* Wed Oct 08 2025 Steve Cossette - 25.08.2-1 -- 25.08.2 - -* Sun Sep 21 2025 Steve Cossette - 25.08.1-1 -- 25.08.1 - -* Sat Aug 16 2025 Marc Deop i Argemí - 25.08.0-2 -- Drop i686 support (leaf package) - -* Fri Aug 08 2025 Steve Cossette - 25.08.0-1 -- 25.08.0 - -* Fri Jul 25 2025 Steve Cossette - 25.07.90-1 -- 25.07.90 - -* Fri Jul 11 2025 Steve Cossette - 25.07.80-1 -- 25.07.80 - -* Thu Jul 03 2025 Steve Cossette - 25.04.3-1 -- 25.04.3 - -* Wed Jun 04 2025 Steve Cossette - 25.04.2-1 -- 25.04.2 - -* Wed May 14 2025 Steve Cossette - 25.04.1-1 -- 25.04.1 - -* Sat Apr 12 2025 Steve Cossette - 25.04.0-1 -- 25.04.0 - -* Thu Mar 20 2025 Steve Cossette - 25.03.80-1 -- 25.03.80 (Beta) - -* Tue Mar 04 2025 Steve Cossette - 24.12.3-1 -- 24.12.3 - -* Fri Feb 21 2025 Steve Cossette - 24.12.2-2 -- Rebuild for ppc64le enablement - -* Wed Feb 05 2025 Steve Cossette - 24.12.2-1 -- 24.12.2 - -* Sun Jan 19 2025 Fedora Release Engineering - 24.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 07 2025 Steve Cossette - 24.12.1-1 -- 24.12.1 - -* Sat Dec 07 2024 Marc Deop i Argemí - 24.12.0-1 -- 24.12.0 - -* Fri Nov 29 2024 Marc Deop i Argemí - 24.11.90-1 -- 24.11.90 - -* Fri Nov 15 2024 Marc Deop i Argemí - 24.11.80-1 -- 24.11.80 - -* Tue Nov 05 2024 Steve Cossette - 24.08.3-1 -- 24.08.3 - -* Tue Oct 08 2024 Steve Cossette - 24.08.2-1 -- 24.08.2 - -* Wed Sep 25 2024 Alessandro Astone - 24.08.1-1 -- 24.08.1 - -* Thu Aug 22 2024 Steve Cossette - 24.08.0-1 -- 24.08.0 - -* Sat Jul 20 2024 Fedora Release Engineering - 24.05.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Jul 07 2024 Marc Deop i Argemí - 24.05.2-1 -- 24.05.2 - -* Fri Jun 14 2024 Marc Deop i Argemí - 24.05.1-1 -- 24.05.1 - -* Fri May 17 2024 Marc Deop i Argemí - 24.05.0-1 -- 24.05.0 - -* Fri Apr 12 2024 Marc Deop i Argemí - 24.02.2-1 -- 24.02.2 - -* Fri Mar 29 2024 Marc Deop i Argemí - 24.02.1-1 -- 24.02.1 - -* Wed Feb 21 2024 Marc Deop i Argemí - 24.02.0-1 -- 24.02.0 - -* Wed Jan 31 2024 Marc Deop i Argemí - 24.01.95-1 -- 24.01.95 - -* Sat Jan 27 2024 Fedora Release Engineering - 24.01.90-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 11 2024 Marc Deop i Argemí - 24.01.90-1 -- 24.01.90 - -* Sat Dec 23 2023 ales.astone@gmail.com - 24.01.85-1 -- 24.01.85 - -* Thu Dec 14 2023 Steve Cossette - 24.01.80-1 -- 24.01.80 - -* Thu Oct 12 2023 Marc Deop i Argemí - 23.08.2-1 -- 23.08.2 - -* Sat Sep 16 2023 Marc Deop i Argemí - 23.08.1-1 -- 23.08.1 - -* Sat Aug 26 2023 Marc Deop i Argemí - 23.08.0-1 -- 23.08.0 - -* Sat Jul 22 2023 Fedora Release Engineering - 23.04.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jul 08 2023 Marc Deop i Argemí - 23.04.3-1 -- 23.04.3 - -* Tue Jun 06 2023 Marc Deop i Argemí - 23.04.2-1 -- 23.04.2 - -* Sat May 13 2023 Marc Deop i Argemí - 23.04.1-1 -- 23.04.1 - -* Fri Apr 14 2023 Marc Deop i Argemí - 23.04.0-1 -- 23.04.0 - -* Fri Mar 31 2023 Marc Deop i Argemí - 23.03.90-1 -- 23.03.90 - -* Mon Mar 20 2023 Marc Deop i Argemí - 23.03.80-1 -- 23.03.80 - -* Thu Mar 02 2023 Marc Deop i Argemí - 22.12.3-1 -- 22.12.3 - -* Tue Jan 31 2023 Marc Deop - 22.12.2-1 -- 22.12.2 - -* Sat Jan 21 2023 Fedora Release Engineering - 22.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Jan 03 2023 Justin Zobel - 22.12.1-1 -- Update to 22.12.1 - -* Mon Dec 19 2022 Marc Deop - 22.12.0-1 -- 22.12.0 - -* Fri Nov 04 2022 Marc Deop i Argemí (Private) - 22.08.3-1 -- 22.08.3 - -* Fri Oct 14 2022 Marc Deop - 22.08.2-1 -- 22.08.2 - -* Thu Sep 08 2022 Marc Deop - 22.08.1-1 -- 22.08.1 - -* Fri Aug 19 2022 Marc Deop - 22.08.0-1 -- 22.08.0 - -* Sat Jul 23 2022 Fedora Release Engineering - 22.04.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jul 18 2022 Than Ngo - 22.04.3-1 -- 22.04.3 - * Thu May 12 2022 Justin Zobel - 22.04.1-1 - Update to 22.04.1 @@ -328,7 +135,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.%{name}.deskt * Wed Mar 02 2022 Marc Deop - 21.12.3-1 - 21.12.3 -* Fri Feb 04 2022 Yaroslav Sidlovsky - 21.12.2-1 +* Fhu Feb 04 2022 Yaroslav Sidlovsky - 21.12.2-1 - update to 21.12.2 * Fri Jul 23 2021 Fedora Release Engineering - 0.5.71-5