Merge branch f34 into epel8

.gitignore

@@ -24,3 +24,19 @@
 /kcoreaddons-5.66.0.tar.xz
 /kcoreaddons-5.67.0.tar.xz
 /kcoreaddons-5.68.0.tar.xz
+/kcoreaddons-5.69.0.tar.xz
+/kcoreaddons-5.70.0.tar.xz
+/kcoreaddons-5.71.0.tar.xz
+/kcoreaddons-5.72.0.tar.xz
+/kcoreaddons-5.73.0.tar.xz
+/kcoreaddons-5.74.0.tar.xz
+/kcoreaddons-5.75.0.tar.xz
+/kcoreaddons-5.76.0.tar.xz
+/kcoreaddons-5.77.0.tar.xz
+/kcoreaddons-5.78.0.tar.xz
+/kcoreaddons-5.79.0.tar.xz
+/kcoreaddons-5.80.0.tar.xz
+/kcoreaddons-5.81.0.tar.xz
+/kcoreaddons-5.82.0.tar.xz
+/kcoreaddons-5.83.0.tar.xz
+/kcoreaddons-5.85.0.tar.xz

kf5-kcoreaddons.spec

@@ -1,3 +1,4 @@
+%undefine __cmake_in_source_build
 %global framework kcoreaddons
 
 # uncomment to enable bootstrap mode
@@ -8,12 +9,12 @@
 %endif
 
 Name:    kf5-%{framework}
-Version: 5.68.0
+Version: 5.85.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 1 addon with various classes on top of QtCore
 
 License: LGPLv2+
-URL:     https://cgit.kde.org/%{framework}.git
+URL:     https://invent.kde.org/frameworks/%{framework}
 
 %global majmin %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -26,6 +27,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{v
 
 ## upstream patches
 
+BuildRequires: make
 BuildRequires:  extra-cmake-modules >= %{majmin}
 BuildRequires:  kf5-rpm-macros >= %{majmin}
 BuildRequires:  qt5-qtbase-devel
@@ -63,19 +65,17 @@ developing applications that use %{name}.
 
 
 %build
-mkdir %{_target_platform}
+%{cmake_kf5} \
-pushd %{_target_platform}
-%{cmake_kf5} .. \
   %{?tests:-DBUILD_TESTING:BOOL=ON}
-popd
+%cmake_build
-
-%make_build -C %{_target_platform}
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 %find_lang_kf5 kcoreaddons5_qt
+%find_lang_kf5 kde5_xml_mimetypes
+cat *.lang > all.lang
 
 
 %check
@@ -104,9 +104,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %ldconfig_scriptlets
 %endif
 
-%files -f kcoreaddons5_qt.lang
+%files -f all.lang
 %doc README.md
-%license COPYING.LIB
+%license LICENSES/*.txt
 %{_kf5_datadir}/qlogging-categories5/%{framework}.*
 %{_kf5_bindir}/desktoptojson
 %{_kf5_libdir}/libKF5CoreAddons.so.*
@@ -122,6 +122,69 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Thu Aug 12 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.85.0-1
+- 5.85.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.83.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 08 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.83.0-1
+- 5.83.0
+
+* Mon May 03 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.82.0-1
+- 5.82.0
+
+* Tue Apr 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.81.0-1
+- 5.81.0
+
+* Tue Mar 09 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.80.0-1
+- 5.80.0
+
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.79.0-2
+- respin
+
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.79.0-1
+- 5.79.0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.78.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan  4 08:42:40 CST 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.78.0-1
+- 5.78.0
+
+* Thu Dec 24 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-2
+- rebuild (gcc11)
+
+* Sun Dec 13 14:10:12 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-1
+- 5.77.0
+
+* Thu Nov 19 08:58:11 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.76.0-1
+- 5.76.0
+
+* Wed Oct 14 09:49:20 CDT 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.75.0-1
+- 5.75.0
+
+* Fri Sep 18 2020 Jan Grulich <jgrulich@redhat.com> - 5.74.0-1
+- 5.74.0
+
+* Mon Aug 03 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.73.0-1
+- 5.73.0
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.72.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 07 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.72.0-1
+- 5.72.0
+
+* Tue Jun 16 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.71.0-1
+- 5.71.0
+
+* Mon May 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.70.0-1
+- 5.70.0
+
+* Tue Apr 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.69.0-1
+- 5.69.0
+
 * Fri Mar 20 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-1
 - 5.68.0
 

sources

@@ -1 +1 @@
-SHA512 (kcoreaddons-5.68.0.tar.xz) = a76e9f05d2a1fcec509f3a02ac6554b284ece1edf96e201c4f129826d16957fa1c1bd6c1f56debb10614c5222d794b094af1fee0d133a05d17ac9c18249cd1b8
+SHA512 (kcoreaddons-5.85.0.tar.xz) = 46509b91a138924c040a7dcee87be1ebe5d5324a040fc76cab1b19e427b03eaf80766a0bfe708d1226be83d8307253061f11604ce122dc8ef354b47dbe3f7753