Merge remote-tracking branch 'up/f38' into f38-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -1,3 +1,4 @@
+/*.src.rpm
 /akonadi-contacts-18.04.0.tar.xz
 /akonadi-contacts-18.04.1.tar.xz
 /akonadi-contacts-18.04.2.tar.xz
@@ -16,3 +17,38 @@
 /akonadi-contacts-19.12.1.tar.xz
 /akonadi-contacts-19.12.2.tar.xz
 /akonadi-contacts-19.12.3.tar.xz
+/akonadi-contacts-20.04.0.tar.xz
+/akonadi-contacts-20.04.1.tar.xz
+/akonadi-contacts-20.04.2.tar.xz
+/akonadi-contacts-20.04.3.tar.xz
+/akonadi-contacts-20.08.0.tar.xz
+/akonadi-contacts-20.08.1.tar.xz
+/akonadi-contacts-20.08.3.tar.xz
+/akonadi-contacts-20.12.2.tar.xz
+/akonadi-contacts-20.12.3.tar.xz
+/akonadi-contacts-21.04.0.tar.xz
+/akonadi-contacts-21.04.1.tar.xz
+/akonadi-contacts-21.04.2.tar.xz
+/akonadi-contacts-21.04.3.tar.xz
+/akonadi-contacts-21.08.2.tar.xz
+/akonadi-contacts-21.08.3.tar.xz
+/akonadi-contacts-21.12.0.tar.xz
+/akonadi-contacts-21.12.1.tar.xz
+/akonadi-contacts-21.12.2.tar.xz
+/akonadi-contacts-21.12.3.tar.xz
+/akonadi-contacts-22.04.0.tar.xz
+/akonadi-contacts-22.04.0.tar.xz
+/akonadi-contacts-22.04.1.tar.xz
+/akonadi-contacts-22.04.2.tar.xz
+/akonadi-contacts-22.04.3.tar.xz
+/akonadi-contacts-22.08.0.tar.xz
+/akonadi-contacts-22.08.1.tar.xz
+/akonadi-contacts-22.08.2.tar.xz
+/akonadi-contacts-22.08.3.tar.xz
+/akonadi-contacts-22.12.0.tar.xz
+/akonadi-contacts-22.12.1.tar.xz
+/akonadi-contacts-22.12.2.tar.xz
+/akonadi-contacts-22.12.3.tar.xz
+/akonadi-contacts-23.03.80.tar.xz
+/akonadi-contacts-23.03.90.tar.xz
+/akonadi-contacts-23.04.0.tar.xz

kf5-akonadi-contacts.spec

@@ -8,12 +8,12 @@
 %endif
 
 Name:    kf5-%{framework}
-Version: 19.12.3
-Release: 2%{?dist}
+Version: 23.04.0
+Release: 1.0.riscv64%{?dist}
 Summary: The Akonadi Contacts Library
 
 License: LGPLv2+
-URL:     https://cgit.kde.org/%{framework}.git
+URL:     https://invent.kde.org/frameworks/%{framework}
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -21,7 +21,7 @@ URL:     https://cgit.kde.org/%{framework}.git
 %else
 %global stable stable
 %endif
-Source0:        http://download.kde.org/%{stable}/applications/%{version}/src/%{framework}-%{version}.tar.xz
+Source0:        http://download.kde.org/%{stable}/release-service/%{version}/src/%{framework}-%{version}.tar.xz
 
 # handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
 %{?qt5_qtwebengine_arches:ExclusiveArch: %{qt5_qtwebengine_arches}}
@@ -29,28 +29,32 @@ Source0:        http://download.kde.org/%{stable}/applications/%{version}/src/%{
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-rpm-macros
-%global kf5_ver 5.39
+%global kf5_ver 5.83
 BuildRequires:  kf5-kdbusaddons-devel >= %{kf5_ver}
 BuildRequires:  kf5-kio-devel >= %{kf5_ver}
 BuildRequires:  kf5-kconfig-devel >= %{kf5_ver}
 BuildRequires:  kf5-ki18n-devel >= %{kf5_ver}
-BuildRequires:  kf5-ki18n-devel >= %{kf5_ver}
+BuildRequires:  kf5-kcmutils-devel >= %{kf5_ver}
 BuildRequires:  kf5-kitemmodels-devel >= %{kf5_ver}
 BuildRequires:  kf5-prison-devel >= %{kf5_ver}
 
 BuildRequires:  cmake(Grantlee5) >= 5.1
+%ifnarch riscv64
 BuildRequires:  qt5-qtwebengine-devel
+%endif
 BuildRequires:  cmake(Qt5Widgets) >= 5.8
 
 #global majmin_ver %(echo %{version} | cut -d. -f1,2)
 %global majmin_ver %{version}
 BuildRequires:  kf5-akonadi-mime-devel >= %{majmin_ver}
 BuildRequires:  kf5-akonadi-server-devel >= %{majmin_ver}
+BuildRequires:  kf5-grantleetheme-devel >= %{majmin_ver}
 %if !(0%{?rhel} == 8 && ( "%{_arch}" == "aarch64" || "%{_arch}" == "s390x" ))
 BuildRequires:  kf5-kcalendarcore-devel >= %{majmin_ver}
 %endif
 BuildRequires:  kf5-kcontacts-devel >= %{majmin_ver}
 BuildRequires:  kf5-kmime-devel >= %{majmin_ver}
+BuildRequires:  kf5-libkleo-devel >= %{majmin_ver}
 
 %if 0%{?tests}
 BuildRequires: kf5-akonadi-server >= %{majmin_ver}
@@ -63,6 +67,9 @@ Obsoletes: kf5-akonadi < 16.07
 Obsoletes: kf5-akonadi-contact < 16.07
 Provides:  kf5-akonadi-contact = %{version}-%{release}
 
+# kdepim-apps-libs deprecated, some content moved here
+Obsoletes: kdepim-apps-libs < 20.11.90
+
 %description
 %{summary}.
 
@@ -73,8 +80,10 @@ Requires:  %{name}%{?_isa} = %{version}-%{release}
 Obsoletes: kf5-akonadi-devel < 16.07
 Obsoletes: kf5-akonadi-contact-devel < 16.07
 Provides:  kf5-akonadi-contact-devel = %{version}-%{release}
+Obsoletes: kdepim-apps-libs-devel < 20.11.90
 Requires:  cmake(KF5Akonadi)
 Requires:  cmake(KF5Contacts)
+Requires:  cmake(KF5GrantleeTheme)
 Recommends:  cmake(KF5CalendarCore)
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -86,17 +95,14 @@ developing applications that use %{name}.
 
 
 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kf5} .. \
+%cmake_kf5 \
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
-popd
 
-%make_build -C %{_target_platform}
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 %find_lang %{name} --all-name --with-html
 
@@ -113,32 +119,162 @@ xvfb-run -a \
 %ldconfig_scriptlets
 
 %files -f %{name}.lang
-%{_kf5_datadir}/qlogging-categories5/*%{framework}.*
-%{_kf5_libdir}/libKF5AkonadiContact.so.*
-%{_kf5_libdir}/libKF5ContactEditor.so.*
-%{_kf5_qtplugindir}/kcm_akonadicontact_actions.so
-%{_kf5_qtplugindir}/akonadi/contacts/
-%{_kf5_qtplugindir}/akonadi_serializer_*.so
-%{_kf5_datadir}/akonadi/plugins/serializer/
-%{_kf5_datadir}/kservices5/akonadicontact_actions.desktop
 %dir %{_kf5_datadir}/kf5/akonadi/
+%{_kf5_datadir}/akonadi/plugins/serializer/
 %{_kf5_datadir}/kf5/akonadi/contact/
+%{_kf5_datadir}/qlogging-categories5/*%{framework}.*
+%{_kf5_libdir}/libKPim5AkonadiContact.so.*
+%{_kf5_libdir}/libKPim5ContactEditor.so.*
+%{_kf5_qtplugindir}/akonadi_serializer_*.so
+%{_kf5_qtplugindir}/pim5/kcms/kaddressbook/kcm_akonadicontact_actions.so
+%{_kf5_qtplugindir}/pim5/akonadi/contacts/plugins/categorieseditwidgetplugin.so
 
 %files devel
-%{_kf5_libdir}/cmake/KF5AkonadiContact/
-%{_kf5_libdir}/cmake/KF5ContactEditor/
-%{_kf5_libdir}/libKF5AkonadiContact.so
-%{_kf5_libdir}/libKF5ContactEditor.so
 %{_kf5_archdatadir}/mkspecs/modules/qt_AkonadiContact.pri
 %{_kf5_archdatadir}/mkspecs/modules/qt_ContactEditor.pri
-%{_kf5_includedir}/Akonadi/Contact/
-%{_kf5_includedir}/akonadi/contact/
-%{_kf5_includedir}/ContactEditor/
-%{_kf5_includedir}/contacteditor/
-
+%{_includedir}/KPim5/AkonadiContact/
+%{_includedir}/KPim5/AkonadiContactEditor/
+%{_kf5_libdir}/cmake/KF5AkonadiContact/
+%{_kf5_libdir}/cmake/KPim5AkonadiContact/
+%{_kf5_libdir}/cmake/KF5AkonadiContactEditor/
+%{_kf5_libdir}/cmake/KPim5ContactEditor/
+%{_kf5_libdir}/libKPim5AkonadiContact.so
+%{_kf5_libdir}/libKPim5ContactEditor.so
 
 
 %changelog
+* Tue May 16 2023 David Abdurachmanov <davidlt@rivosinc.com> - 23.04.0-1.0.riscv64
+- Do not use qt5-qtwebengine on riscv64
+
+* Fri Apr 14 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.04.0-1
+- 23.04.0
+
+* Fri Mar 31 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.03.90-1
+- 23.03.90
+
+* Mon Mar 20 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.03.80-1
+- 23.03.80
+
+* Thu Mar 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 22.12.3-1
+- 22.12.3
+
+* Tue Jan 31 2023 Marc Deop <marcdeop@fedoraproject.org> - 22.12.2-1
+- 22.12.2
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 22.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 03 2023 Justin Zobel <justin@1707.io> - 22.12.1-1
+- Update to 22.12.1
+
+* Tue Jan 03 2023 Justin Zobel <justin@1707.io> - 22.12.1-1
+- Update to 22.12.1
+
+* Mon Dec 19 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.12.0-1
+- 22.12.0
+
+* Fri Nov 04 2022 Marc Deop i Argemí (Private) <marc@marcdeop.com> - 22.08.3-1
+- 22.08.3
+
+* Fri Oct 14 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.2-1
+- 22.08.2
+
+* Thu Sep 08 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.1-1
+- 22.08.1
+
+* Fri Aug 19 2022 Marc Deop <marcdeop@fedoraproject.org> - 22.08.0-1
+- 22.08.0
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 22.04.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Than Ngo <than@redhat.com> - 22.04.3-1
+- 22.04.3
+
+* Thu Jun 23 2022 Than Ngo <than@redhat.com> - 22.04.2-1
+- 22.04.2
+
+* Thu May 12 2022 Justin Zobel <justin@1707.io> - 22.04.1-1
+- Update to 22.04.1
+
+* Mon May 09 2022 Justin Zobel <justin@1707.io> - 22.04.0-1
+- Update to 22.04.0
+
+* Wed Mar 02 2022 Marc Deop <marcdeop@fedoraproject.org> - 21.12.3-1
+- 21.12.3
+
+* Fri Feb 04 2022 Rex Dieter <rdieter@fedoraproject.org> - 21.12.2-1
+- 21.12.2
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jan 06 2022 Marc Deop <marcdeop@fedoraproject.org> - 21.12.1-1
+- 21.12.1
+
+* Mon Dec 20 2021 Marc Deop <marcdeop@fedoraproject.org> - 21.12.0-1
+- 21.12.0
+
+* Tue Nov 02 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.08.3-1
+- 21.08.3
+
+* Thu Oct 21 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.08.2-1
+- 21.08.2
+
+* Wed Jul 28 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.3-1
+- 21.04.3
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.04.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 11 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.2-1
+- 21.04.2
+
+* Tue May 11 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.1-1
+- 21.04.1
+
+* Tue Apr 27 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.0-1
+- 21.04.0
+
+* Wed Mar 03 2021 Rex Dieter <rdieter@fedoraproject.org> - 20.12.3-1
+- 20.12.3
+
+* Fri Feb 05 2021 Rex Dieter <rdieter@fedoraproject.org> - 20.12.2-3
+- -devel: Requires: cmake(KF5GrantleeTheme)
+
+* Fri Feb 05 2021 Rex Dieter <rdieter@fedoraproject.org> - 20.12.2-2
+- Obsoletes: kdepim-apps-libs(-devel)
+
+* Thu Feb 04 2021 Rex Dieter <rdieter@fedoraproject.org> - 20.12.2-1
+- 20.12.2
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.08.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Nov  6 15:36:45 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.3-1
+- 20.08.3
+
+* Tue Sep 15 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.1-1
+- 20.08.1
+
+* Tue Aug 18 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.08.0-1
+- 20.08.0
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.04.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.04.3-1
+- 20.04.3
+
+* Fri Jun 12 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.04.2-1
+- 20.04.2
+
+* Wed May 27 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.04.1-1
+- 20.04.1
+
+* Fri Apr 24 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.04.0-1
+- 20.04.0
+
 * Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 19.12.3-2
 - Fix string quoting for rpm >= 4.16
 

sources

@@ -1 +1 @@
-SHA512 (akonadi-contacts-19.12.3.tar.xz) = 23f896114ba66cce06069538768559c665e6d0bf7bc24b3cd2d801d41e7421f2f79f670a0af740dfbcd3fdc48584ff77cf2e156159450e484b0b8b137cdee4c2
+SHA512 (akonadi-contacts-23.04.0.tar.xz) = 5870816abc0a69ed2f4e826b3d4cd5159b8ba8f5344a69ba06ad67f63e6ff8063ddc884aeaccdefff39bc7b1d099c50a4c410792d680486cd1c58741814cb31f