Merge branch f34 into epel8

3 years ago · 1fabb15d81
parent 467d9bdfa2 ad8e81a659
commit 1fabb15d81
3 changed files with 84 additions and 11 deletions
--- a/.gitignore
+++ b/.gitignore
@ -20,3 +20,19 @@
 /kconfigwidgets-5.66.0.tar.xz
 /kconfigwidgets-5.67.0.tar.xz
 /kconfigwidgets-5.68.0.tar.xz
+/kconfigwidgets-5.69.0.tar.xz
+/kconfigwidgets-5.70.0.tar.xz
+/kconfigwidgets-5.71.0.tar.xz
+/kconfigwidgets-5.72.0.tar.xz
+/kconfigwidgets-5.73.0.tar.xz
+/kconfigwidgets-5.74.0.tar.xz
+/kconfigwidgets-5.75.0.tar.xz
+/kconfigwidgets-5.76.0.tar.xz
+/kconfigwidgets-5.77.0.tar.xz
+/kconfigwidgets-5.78.0.tar.xz
+/kconfigwidgets-5.79.0.tar.xz
+/kconfigwidgets-5.80.0.tar.xz
+/kconfigwidgets-5.81.0.tar.xz
+/kconfigwidgets-5.82.0.tar.xz
+/kconfigwidgets-5.83.0.tar.xz
+/kconfigwidgets-5.85.0.tar.xz
--- a/kf5-kconfigwidgets.spec
+++ b/kf5-kconfigwidgets.spec
@ -1,12 +1,13 @@
+%undefine __cmake_in_source_build
 %global framework kconfigwidgets

 Name:           kf5-%{framework}
-Version: 5.68.0
+Version: 5.85.0
 Release: 1%{?dist}
 Summary:        KDE Frameworks 5 Tier 3 addon for creating configuration dialogs

 License:        GPLv2+ and LGPLv2+ and MIT
-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)
@ -52,16 +53,12 @@ developing applications that use %{name}.


 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kf5} ..
-popd
-
-%make_build -C %{_target_platform}
+%{cmake_kf5}
+%cmake_build


 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install

 %find_lang %{name} --with-man --all-name

@ -70,7 +67,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

 %files -f %{name}.lang
 %doc README.md
-%license COPYING COPYING.LIB
+%license LICENSES/*.txt
 %{_kf5_datadir}/qlogging-categories5/%{framework}*
 %{_kf5_libdir}/libKF5ConfigWidgets.so.*
 ## fixme: %%lang'ify these -- rex
@ -88,6 +85,66 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}


 %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:16 CST 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.78.0-1
+- 5.78.0
+
+* Sun Dec 13 14:09:59 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-1
+- 5.77.0
+
+* Thu Nov 19 08:57:52 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.76.0-1
+- 5.76.0
+
+* Wed Oct 14 09:49:00 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

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (kconfigwidgets-5.68.0.tar.xz) = db93c37920dd92180cc7e019f1c96d91ba5aaaa9cfd3b1d98d3e5b1b7cc828c204bb27ac83694836234eb41faef3278a0d14d3df974b3228aec631e26cb0e9e6
+SHA512 (kconfigwidgets-5.85.0.tar.xz) = dddcfd54e36b2c45ab42d5e61811141eff2bb8d2d70a5bd09993e742bee05bf18a3b2e94b2ff8bcf6199db84044542a8d3d01a36f6b29d7d9b33e6c82392ac7b