Merge branch f34 into epel8

.gitignore

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

kf5-kguiaddons.spec

@@ -1,12 +1,13 @@
+%undefine __cmake_in_source_build
 %global framework kguiaddons
 
-Name:           kf5-%{framework}
-Version: 5.68.0
+Name:    kf5-%{framework}
+Version: 5.85.0
 Release: 1%{?dist}
-Summary:        KDE Frameworks 5 Tier 1 addon with various classes on top of QtGui
+Summary: KDE Frameworks 5 Tier 1 addon with various classes on top of QtGui
 
-License:        GPLv2+ and LGPLv2+
-URL:            https://cgit.kde.org/%{framework}.git
+License: GPLv2+ and LGPLv2+
+URL:     https://invent.kde.org/frameworks/%{framework}
 
 %global majmin %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -15,13 +16,15 @@ URL:            https://cgit.kde.org/%{framework}.git
 %else
 %global stable stable
 %endif
-Source0:        http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
 BuildRequires:  extra-cmake-modules >= %{majmin}
 BuildRequires:  kf5-rpm-macros >= %{majmin}
 BuildRequires:  libX11-devel
 BuildRequires:  libxcb-devel
 BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtbase-private-devel
+BuildRequires:  qt5-qtwayland-devel pkgconfig(wayland-client)
 BuildRequires:  qt5-qtx11extras-devel
 
 Requires:       kf5-filesystem >= %{majmin}
@@ -43,23 +46,21 @@ developing applications that use %{name}.
 
 
 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kf5} ..
-popd
+%cmake_kf5
 
-%make_build -C %{_target_platform}
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 
 %ldconfig_scriptlets
 
 %files
 %doc README.md
-%license COPYING COPYING.LIB
+%license LICENSES/*.txt
+%{_kf5_datadir}/qlogging-categories5/*categories
 %{_kf5_libdir}/libKF5GuiAddons.so.*
 %{_kf5_plugindir}/kguiaddons/
 
@@ -72,6 +73,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:46:42 CST 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.78.0-1
+- 5.78.0
+
+* Sun Dec 13 14:13:24 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-1
+- 5.77.0
+
+* Thu Nov 19 09:02:28 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.76.0-1
+- 5.76.0
+
+* Wed Oct 14 09:54:43 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 (kguiaddons-5.68.0.tar.xz) = 9547c8717f5ea32a46165ddfc5cd9b3d02b0f318a0efd580ed22d6183d7fa3b43b8068e43cefc25aa811a3a7e1f692e33a517055204c8171b6ca569d43683f00
+SHA512 (kguiaddons-5.85.0.tar.xz) = 0f2b1f0201028da520ac0b04fd66c753a953a675cd29249bab79807b08739979601499530be119b5bda124bda4dd09e10c8e11b68d0bcaf8a1a2283e853cadc5