0001-modify-find-X11-X11-error.patch

@@ -1,27 +0,0 @@
-From c6c2611fcc219c391c3c639bb85dc0c86a5abd77 Mon Sep 17 00:00:00 2001
-From: pei-jiankang <peijiankang@kylinos.cn>
-Date: Wed, 23 Feb 2022 11:50:41 +0800
-Subject: [PATCH] modify find X11::X11 error
-
----
- KF5WindowSystemConfig.cmake.in | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in
-index 98801b2..f6678d4 100644
---- a/KF5WindowSystemConfig.cmake.in
-+++ b/KF5WindowSystemConfig.cmake.in
-@@ -7,9 +7,7 @@ if(NOT @KWINDOWSYSTEM_NO_WIDGETS@)
-     find_dependency(Qt@QT_MAJOR_VERSION@Widgets @REQUIRED_QT_VERSION@)
- endif()
- 
--if(@X11_FOUND@)
--    find_dependency(X11)
--endif()
-+find_dependency(X11)
- 
- if(NOT @BUILD_SHARED_LIBS@)
-     if(@WIN32@)
--- 
-2.33.0
-

kf5-kwindowsystem.spec

@@ -1,7 +1,8 @@
+%undefine __cmake_in_source_build
 %global framework kwindowsystem
 
 ## uncomment to enable bootstrap mode
-#global bootstrap 1
+%global bootstrap 1
 
 ## currently includes no tests
 %if !0%{?bootstrap} 
@@ -9,7 +10,7 @@
 %endif
 
 Name:           kf5-%{framework}
-Version:        5.100.0
+Version:        5.88.0
 Release:        1
 Summary:        KDE Frameworks 5 Tier 1 integration module with classes for windows management
 
@@ -23,8 +24,8 @@ URL:            https://invent.kde.org/frameworks/%{framework}
 %else
 %global stable stable
 %endif
-Source0:        http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
-Patch01:        0001-modify-find-X11-X11-error.patch
+Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
+
 # filter plugin provides
 %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$
 
@@ -42,11 +43,11 @@ BuildRequires:  qt5-qttools-devel
 BuildRequires:  qt5-qtx11extras-devel
 
 %if 0%{?tests}
-BuildRequires:  openbox
+BuildRequires: openbox
 %if 0%{?fedora}
-BuildRequires:  weston
+BuildRequires: weston
 %endif
-BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires: xorg-x11-server-Xvfb
 %endif
 
 Requires:       kf5-filesystem >= %{majmin}
@@ -71,7 +72,7 @@ developing applications that use %{name}.
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%cmake_kf5 .. \
+%{cmake_kf5} .. \
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
 popd
 
@@ -100,10 +101,11 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 %{_kf5_datadir}/qlogging-categories5/%{framework}.*
 %{_kf5_libdir}/libKF5WindowSystem.so.*
 %dir %{_kf5_plugindir}/kwindowsystem/
-#{_kf5_plugindir}/kwindowsystem/KF5WindowSystemWaylandPlugin.so
+%{_kf5_plugindir}/kwindowsystem/KF5WindowSystemWaylandPlugin.so
 %{_kf5_plugindir}/kwindowsystem/KF5WindowSystemX11Plugin.so
 
 %files devel
+%{_kf5_includedir}/kwindowsystem_version.h
 %{_kf5_includedir}/KWindowSystem/
 %{_kf5_libdir}/libKF5WindowSystem.so
 %{_kf5_libdir}/cmake/KF5WindowSystem/
@@ -111,26 +113,8 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 
 
 %changelog
-* Mon Dec 12 2022 liqiuyu <liqiuyu@kylinos.cn> - 5.100.0-1
-- Update package to version 5.100.0
-
-* Mon Sep 05 2022 liweiganga <liweiganga@uniontech.com> - 5.97.0-1
-- update to upstream version 5.97.0
-
-* Tue Jul 05 2022 huayadong <huayadong@kylinos.cn> - 5.95.0-1
-- update to upstream version 5.95.0
-
-* Wed Feb 23 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.90.0-2
-- modify find X11::X11 error
-
-* Sat Feb 12 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.90.0-1
-- update to upstream version 5.90.0
-
-* Fri Jan 14 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.88.0-1
+* Fri Jan 14 2022 pei-jiankang<peijiankang@kylinos.com> - 5.88.0-1
 - update to upstream version 5.88.0
 
-* Mon Dec 13 2021 douyan <douyan@kylinos.cn> - 5.55.0-2
-- remove %{?dist}
-
 * Thu Jul 23 2020 Zhao Yang <yangzhao1@kylinos.cn> - 5.55.0-1
 - Initial release for OpenEuler