diff --git a/.gitignore b/.gitignore index ee91ba9..9649873 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,38 @@ /akonadi-import-wizard-23.08.0.tar.xz /akonadi-import-wizard-23.08.1.tar.xz /akonadi-import-wizard-23.08.2.tar.xz +/akonadi-import-wizard-24.01.80.tar.xz +/akonadi-import-wizard-24.01.85.tar.xz +/akonadi-import-wizard-24.01.90.tar.xz +/akonadi-import-wizard-24.01.95.tar.xz +/akonadi-import-wizard-24.02.0.tar.xz +/akonadi-import-wizard-24.02.1.tar.xz +/akonadi-import-wizard-24.02.2.tar.xz +/akonadi-import-wizard-24.05.0.tar.xz +/akonadi-import-wizard-24.05.1.tar.xz +/akonadi-import-wizard-24.05.2.tar.xz +/akonadi-import-wizard-24.08.0.tar.xz +/akonadi-import-wizard-24.08.1.tar.xz +/akonadi-import-wizard-24.08.2.tar.xz +/akonadi-import-wizard-24.08.3.tar.xz +/akonadi-import-wizard-24.11.80.tar.xz +/akonadi-import-wizard-24.11.90.tar.xz +/akonadi-import-wizard-24.12.0.tar.xz +/akonadi-import-wizard-24.12.1.tar.xz +/akonadi-import-wizard-24.12.2.tar.xz +/akonadi-import-wizard-24.12.3.tar.xz +/akonadi-import-wizard-25.03.80.tar.xz +/akonadi-import-wizard-25.04.0.tar.xz +/akonadi-import-wizard-25.04.1.tar.xz +/akonadi-import-wizard-25.04.2.tar.xz +/akonadi-import-wizard-25.04.3.tar.xz +/akonadi-import-wizard-25.07.80.tar.xz +/akonadi-import-wizard-25.07.90.tar.xz +/akonadi-import-wizard-25.08.0.tar.xz +/akonadi-import-wizard-25.08.1.tar.xz +/akonadi-import-wizard-25.08.2.tar.xz +/akonadi-import-wizard-25.08.3.tar.xz +/akonadi-import-wizard-25.11.80.tar.xz +/akonadi-import-wizard-25.11.90.tar.xz +/akonadi-import-wizard-25.12.0.tar.xz +/akonadi-import-wizard-25.12.1.tar.xz diff --git a/akonadi-import-wizard.spec b/akonadi-import-wizard.spec index f097dd7..ac18840 100644 --- a/akonadi-import-wizard.spec +++ b/akonadi-import-wizard.spec @@ -1,67 +1,49 @@ -# uncomment to enable bootstrap mode -%global bootstrap 1 - -%if !0%{?bootstrap} -%global tests 1 -%endif - %global framework importwizard Name: akonadi-import-wizard Summary: Akonadi Import Wizard -Version: 23.08.2 -Release: 1%{?dist} +Version: 25.12.1 +Release: 2%{?dist} -# code (generally) GPLv2, docs GFDL -License: GPLv2 and GFDL +License: BSD-3-Clause AND CC0-1.0 AND GPL-2.0-or-later AND LGPL-2.0-or-later URL: https://invent.kde.org/pim/%{name} -%global revision %(echo %{version} | cut -d. -f3) -%if %{revision} >= 50 -%global stable unstable -%else -%global stable stable -%endif -Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz -# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches -%{?qt5_qtwebengine_arches:ExclusiveArch: %{qt5_qtwebengine_arches}} +# handled by qt6-srpm-macros, which defines %%qt6_qtwebengine_arches +%{?qt6_qtwebengine_arches:ExclusiveArch: %{qt6_qtwebengine_arches}} BuildRequires: desktop-file-utils BuildRequires: gettext -#BuildRequires: libappstream-glib -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Gui) BuildRequires: extra-cmake-modules -BuildRequires: cmake(Grantlee5) -BuildRequires: kf5-rpm-macros -BuildRequires: cmake(KF5Auth) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake +BuildRequires: kf6-rpm-macros +BuildRequires: cmake(KF6Config) +BuildRequires: cmake(KF6DBusAddons) +BuildRequires: cmake(KF6Auth) +BuildRequires: cmake(KF6DocTools) +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6KIO) +BuildRequires: cmake(KF6Archive) +BuildRequires: cmake(KF6I18n) -%global majmin_ver %(echo %{version} | cut -d. -f1,2) -BuildRequires: kf5-akonadi-server-devel >= %{majmin_ver} -BuildRequires: kf5-kcontacts-devel >= %{majmin_ver} -BuildRequires: kf5-kidentitymanagement-devel >= %{majmin_ver} -BuildRequires: kf5-kmailtransport-devel >= %{majmin_ver} -BuildRequires: kf5-libkdepim-devel >= %{majmin_ver} -BuildRequires: kf5-mailcommon-devel >= %{majmin_ver} -BuildRequires: kf5-mailimporter-devel >= %{majmin_ver} -BuildRequires: kf5-messagelib-devel >= %{majmin_ver} -BuildRequires: kf5-pimcommon-devel >= %{majmin_ver} - -BuildRequires: cmake(Qt5Keychain) - -%if 0%{?tests} -BuildRequires: dbus-x11 -BuildRequires: xorg-x11-server-Xvfb -BuildRequires: make -%endif +BuildRequires: cmake(KPim6Akonadi) +BuildRequires: cmake(KF6Contacts) +BuildRequires: cmake(KPim6IdentityManagementCore) +BuildRequires: cmake(KPim6MailTransport) +BuildRequires: cmake(KPim6MailCommon) +BuildRequires: cmake(KPim6MailImporterAkonadi) +BuildRequires: cmake(KPim6MessageViewer) +BuildRequires: cmake(KPim6PimCommonAkonadi) +BuildRequires: cmake(KPim6Libkdepim) +BuildRequires: cmake(KF6TextTemplate) +BuildRequires: cmake(Qt6Keychain) +BuildRequires: cmake(QGpgmeQt6) +BuildRequires: cmake(KF6IconThemes) # when split out Conflicts: kdepim-common < 16.12 @@ -72,7 +54,7 @@ Conflicts: kdepim-common < 16.12 %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: cmake(KF5MailTransport) +Requires: cmake(KPim6MailTransport) %description devel %{summary}. @@ -83,55 +65,162 @@ Requires: cmake(KF5MailTransport) %build -%cmake_kf5 \ - -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} - +%cmake_kf6 %cmake_build %install %cmake_install - %find_lang %{name} --all-name --with-html %check -## currently fails on all RHEL releases -# RHEL8: https://bugzilla.redhat.com/show_bug.cgi?id=2107277 -# RHEL9: https://bugzilla.redhat.com/show_bug.cgi?id=2107278 -%if !0%{?rhel} -desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.akonadiimportwizard.desktop -%endif -#appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml -%if 0%{?tests} -export CTEST_OUTPUT_ON_FAILURE=1 -xvfb-run -a \ -dbus-launch --exit-with-session \ -make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: -%endif +desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.akonadiimportwizard.desktop -%ldconfig_scriptlets - %files -f %{name}.lang %license LICENSES/* -%{_kf5_datadir}/qlogging-categories5/*%{framework}.* -%{_kf5_bindir}/akonadiimportwizard -%{_kf5_datadir}/applications/org.kde.akonadiimportwizard.desktop -%{_kf5_datadir}/icons/hicolor/*/apps/kontact-import-wizard.* -%{_kf5_datadir}/importwizard/ -# -libs? -%{_kf5_libdir}/libKPim5ImportWizard.so.5* -%{_kf5_qtplugindir}/pim5/importwizard/ +%{_kf6_datadir}/qlogging-categories6/*%{framework}.* +%{_kf6_bindir}/akonadiimportwizard +%{_kf6_datadir}/applications/org.kde.akonadiimportwizard.desktop +%{_kf6_datadir}/icons/hicolor/*/apps/kontact-import-wizard.* +%{_kf6_datadir}/importwizard/ +%{_kf6_libdir}/libKPim6ImportWizard.so.* +%{_kf6_qtplugindir}/pim6/importwizard/ %files devel -%{_kf5_libdir}/libKPim5ImportWizard.so -%{_kf5_libdir}/cmake/KPimImportWizard/ -%{_kf5_libdir}/cmake/KPim5ImportWizard/ -%dir %{_includedir}/KPim5/ -%{_includedir}/KPim5/ImportWizard/ +%{_kf6_libdir}/libKPim6ImportWizard.so +%{_kf6_libdir}/cmake/KPim6ImportWizard/ +%dir %{_includedir}/KPim6/ +%{_includedir}/KPim6/ImportWizard/ %changelog +* Fri Jan 16 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 + +* 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 + +* Wed Jul 23 2025 Fedora Release Engineering - 25.07.80-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* 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 + +* Thu Jan 16 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 + +* Wed Jul 17 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 + +* Mon Jan 22 2024 Fedora Release Engineering - 24.01.90-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 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 diff --git a/sources b/sources index 03021db..7386f62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (akonadi-import-wizard-23.08.2.tar.xz) = ff341f4bc7fe7453c6d0256985c52689418c1a6e1e272eadff65de325ba947bcc4e755ac2b81c0d84634f0fff6b7f8c56f84523c7ce92eefa634fd06cabaed2a +SHA512 (akonadi-import-wizard-25.12.1.tar.xz) = 01fac1a26193b7197b9b91018b97b580b38b0fa336373861b14a8269624b7e48ffb82bb26f8662c844962e7e9ec0f61f7ffdfb970abc68605e5d5a4d1e927599