Merge branch f34 into epel8

.gitignore

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

kf5-kwindowsystem.spec

@@ -1,20 +1,23 @@
+%undefine __cmake_in_source_build
 %global framework kwindowsystem
 
 ## uncomment to enable bootstrap mode
 %global bootstrap 1
 
 ## currently includes no tests
-%if !0%{?bootstrap}
+%if !0%{?bootstrap} 
+%if 0%{?fedora} || 0%{?epel}
 %global tests 1
 %endif
+%endif
 
 Name:    kf5-%{framework}
-Version: 5.68.0
+Version: 5.85.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 1 integration module with classes for windows management
 
 License: 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)
@@ -28,6 +31,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{v
 # filter plugin provides
 %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$
 
+BuildRequires: make
 BuildRequires:  extra-cmake-modules >= %{majmin}
 BuildRequires:  kf5-rpm-macros >= %{majmin}
 BuildRequires:  pkgconfig(x11)
@@ -68,17 +72,13 @@ developing applications that use %{name}.
 
 
 %build
-mkdir %{_target_platform}
+%{cmake_kf5} \
-pushd %{_target_platform}
-%{cmake_kf5} .. \
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
-popd
+%cmake_build
-
-%make_build -C %{_target_platform}
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 %find_lang_kf5 kwindowsystem5_qt
 
@@ -95,12 +95,12 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 
 %files -f kwindowsystem5_qt.lang
 %doc README.md
-%license COPYING.LIB
+%license LICENSES/*.txt
 %{_kf5_datadir}/qlogging-categories5/%{framework}.*
 %{_kf5_libdir}/libKF5WindowSystem.so.*
-%dir %{_kf5_plugindir}/org.kde.kwindowsystem.platforms/
+%dir %{_kf5_plugindir}/kwindowsystem/
-%{_kf5_plugindir}/org.kde.kwindowsystem.platforms/KF5WindowSystemWaylandPlugin.so
+%{_kf5_plugindir}/kwindowsystem/KF5WindowSystemWaylandPlugin.so
-%{_kf5_plugindir}/org.kde.kwindowsystem.platforms/KF5WindowSystemX11Plugin.so
+%{_kf5_plugindir}/kwindowsystem/KF5WindowSystemX11Plugin.so
 
 %files devel
 %{_kf5_includedir}/kwindowsystem_version.h
@@ -111,6 +111,66 @@ make test ARGS="--output-on-failure --timeout 30" -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:56:55 CST 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.78.0-1
+- 5.78.0
+
+* Sun Dec 13 14:20:28 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-1
+- 5.77.0
+
+* Thu Nov 19 09:13:33 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.76.0-1
+- 5.76.0
+
+* Wed Oct 14 10:06:58 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 (kwindowsystem-5.68.0.tar.xz) = 1c7abbdcd3d4b32c4e04eecabafe319f6b7d40d8634e769db4ec3871cfb68030ed6d402ea78ab5de1c873ec710aedff2a80fce6a56135ee57dd81c69c32a03f9
+SHA512 (kwindowsystem-5.85.0.tar.xz) = 517943febe93ec84d91792ece6a2ad4518c3976d4f9ae3ba631713bdb87cec72817d3231da0fa6318c93e7b6ccf4875ba1c079b3838d3d68ad28cb9c35211d43