- update to 5.21.2

diff --git a/kp5-kwin.spec b/kp5-kwin.spec
index 292bc5badc0ffe1163f58f7071919b23d8057951..5849e9aa74eb158bdcb9de6f268200dc48e92e3e 100644 (file)
--- a/kp5-kwin.spec
+++ b/kp5-kwin.spec
@@ -1,18 +1,18 @@
 # TODO:
 # - libhybris
 #
-%define                kdeplasmaver    5.15.3
+%define                kdeplasmaver    5.21.2
 %define                qtver           5.9.0
 %define                kpname          kwin
 #
 Summary:       KDE Window manager
 Name:          kp5-%{kpname}
-Version:       5.15.3
+Version:       5.21.2
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
 Source0:       http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
-# Source0-md5: 2dd5ecd4ecb32be77178d8ac660b94fe
+# Source0-md5: e18502c414487da18f736e12e051bfaa
 Patch0:                kp5-kwin-absolute-path.patch
 URL:           http://www.kde.org/
 BuildRequires: Mesa-libEGL-devel
@@ -46,6 +46,7 @@ BuildRequires:        kf5-kxmlgui-devel
 BuildRequires: kf5-plasma-framework-devel
 BuildRequires: kp5-kdecoration-devel
 BuildRequires: kp5-kscreenlocker-devel
+BuildRequires: kp5-kwayland-server-devel
 BuildRequires: libdrm-devel
 BuildRequires: libepoxy-devel
 BuildRequires: libinput-devel
@@ -89,15 +90,20 @@ rm -rf po/id
 cd build
 %cmake -G Ninja \
        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+       -DHTML_INSTALL_DIR=%{_kdedocdir} \
        ../
 %ninja_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %ninja_install -C build
+rm -rf $RPM_BUILD_ROOT%{_kdedocdir}/{sr,sr@latin}
 
 %find_lang %{kpname} --all-name --with-kde
 
+find $RPM_BUILD_ROOT%{_datadir}/kconf_update -type f -name "*.py" \
+-exec sed -i -e 's#/usr/bin/env python3#/usr/bin/python3#' '{}' +
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -109,25 +115,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/kwin_wayland
 %attr(755,root,root) %{_bindir}/kwin_x11
 %attr(755,root,root) %{_libdir}/kconf_update_bin/kwin5_update_default_rules
-#%%attr(755,root,root) %{_libdir}/kwin_killer_helper
-#%%attr(755,root,root) %{_libdir}/kwin_rules_dialog
-%attr(755,root,root) %{_libdir}/libkdeinit5_kwin_rules_dialog.so
-%attr(755,root,root) %{_libdir}/libkdeinit5_kwin_x11.so
 %attr(755,root,root) %ghost %{_libdir}/libkwin.so.5
 %attr(755,root,root) %{_libdir}/libkwin.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkwin4_effect_builtins.so.1
 %attr(755,root,root) %{_libdir}/libkwin4_effect_builtins.so.*.*.*
 %attr(755,root,root) %{_libdir}/libkwineffects.so.*.*.*
-#%%attr(755,root,root) %ghost %{_libdir}/libkwineffects.so.7
 %attr(755,root,root) %{_libdir}/libkwinglutils.so.*.*.*
-#%%attr(755,root,root) %ghost %{_libdir}/libkwinglutils.so.7
 %attr(755,root,root) %{_libdir}/libkwinxrenderutils.so.*.*.*
-#%%attr(755,root,root) %ghost %{_libdir}/libkwinxrenderutils.so.7
-%attr(755,root,root) %{_libdir}/libkwineffects.so.12
-%attr(755,root,root) %{_libdir}/libkwinglutils.so.12
-%attr(755,root,root) %{_libdir}/libkwinxrenderutils.so.12
 
-#%%{_libdir}/org_kde_kwin_xclipboard_syncer
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_kwintouchscreen.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kpackage/packagestructure/kwin_packagestructure_aurorae.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kpackage/packagestructure/kwin_packagestructure_decoration.so
@@ -137,24 +132,19 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kwin.platforms/KWinX11Platform.so
 
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_kwin_scripts.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/kcm_kwindecoration.so
-#%%attr(755,root,root) %{_libdir}/qt5/plugins/kcm_kwindesktop.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_kwinoptions.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/kcm_kwinrules.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_kwinscreenedges.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_kwintabbox.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/kf5/org.kde.kidletime.platforms/KF5IdleTimeKWinWaylandPrivatePlugin.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandVirtualBackend.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/platforms/KWinQpaPlugin.so
 %dir %{_libdir}/qt5/plugins/kwin
 %dir %{_libdir}/qt5/plugins/kwin/effects
 %dir %{_libdir}/qt5/plugins/kwin/effects/configs
+%dir %{_libdir}/qt5/plugins/kwin/plugins
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kcm_kwin4_genericscripted.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_blur_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_coverswitch_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_cube_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_cubeslide_config.so
-#%%attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_dashboard_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_desktopgrid_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_diminactive_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_flipswitch_config.so
@@ -175,7 +165,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_zoom_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwincompositing.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kdecoration2/kwin5_aurorae.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateKWin.so
 %dir %{_libdir}/qt5/plugins/org.kde.kwin.waylandbackends
 %attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandDrmBackend.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandFbdevBackend.so
@@ -184,11 +173,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/qt5/plugins/org.kde.kwin.scenes
 %attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kwin.scenes/KWinSceneQPainter.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kwin.scenes/KWinSceneXRender.so
-/etc/xdg/aurorae.knsrc
-/etc/xdg/kwineffect.knsrc
-/etc/xdg/kwinscripts.knsrc
-/etc/xdg/kwinswitcher.knsrc
-/etc/xdg/org_kde_kwin.categories
 %{_libdir}/qt5/qml/org/kde/kwin
 %{_datadir}/config.kcfg/kwin.kcfg
 %{_datadir}/dbus-1/interfaces/org.kde.KWin.xml
@@ -198,22 +182,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/scalable/apps/kwin.svgz
 %{_datadir}/knotifications5/kwin.notifyrc
 %{_datadir}/kservices5/*kwin*.desktop
-#%%{_datadir}/kservices5/desktop.desktop
 %{_datadir}/kservices5/kwin
 %{_datadir}/kservicetypes5/kwin*.desktop
 %{_datadir}/kwin
-%{_datadir}/kwincompositing
-#%%attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_scale_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_slide_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/org.kde.kwin.scenes/KWinSceneOpenGL.so
 %attr(755,root,root) %{_prefix}/libexec/kwin_killer_helper
 %attr(755,root,root) %{_prefix}/libexec/kwin_rules_dialog
-%attr(755,root,root) %{_prefix}/libexec/org_kde_kwin_xclipboard_syncer
 %{_datadir}/config.kcfg/kwin_colorcorrect.kcfg
 %{_datadir}/dbus-1/interfaces/org.kde.kwin.ColorCorrect.xml
 %{_datadir}/kconf_update/kwin.upd
 %attr(755,root,root) %ghost %{_libdir}/libkcmkwincommon.so.5
-%attr(755,root,root) %{_libdir}/libkcmkwincommon.so.5.15.3
+%attr(755,root,root) %{_libdir}/libkcmkwincommon.so.5.*.*
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcms/kcm_kwin_virtualdesktops.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kpackage/packagestructure/kwin_packagestructure_effect.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kwin/effects/configs/kwin_showpaint_config.so
@@ -224,6 +204,65 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kpackage/kcms/kcm_kwin_virtualdesktops/contents/ui/main.qml
 %{_datadir}/kpackage/kcms/kcm_kwin_virtualdesktops/metadata.desktop
 %{_datadir}/kpackage/kcms/kcm_kwin_virtualdesktops/metadata.json
+%{_datadir}/knsrcfiles/aurorae.knsrc
+%{_datadir}/knsrcfiles/kwineffect.knsrc
+%{_datadir}/knsrcfiles/kwinscripts.knsrc
+%{_datadir}/knsrcfiles/kwinswitcher.knsrc
+%{_datadir}/knsrcfiles/window-decorations.knsrc
+%dir %{_datadir}/kpackage/kcms
+%dir %{_datadir}/kpackage/kcms/kcm_kwin_effects
+%dir %{_datadir}/kpackage/kcms/kcm_kwin_effects/contents
+%dir %{_datadir}/kpackage/kcms/kcm_kwin_effects/contents/ui
+%{_datadir}/kpackage/kcms/kcm_kwin_effects/contents/ui/Effect.qml
+%{_datadir}/kpackage/kcms/kcm_kwin_effects/contents/ui/Video.qml
+%{_datadir}/kpackage/kcms/kcm_kwin_effects/contents/ui/main.qml
+%{_datadir}/kpackage/kcms/kcm_kwin_effects/metadata.desktop
+%{_datadir}/kpackage/kcms/kcm_kwin_effects/metadata.json
+%dir %{_datadir}/kpackage/kcms/kcm_kwindecoration
+%dir %{_datadir}/kpackage/kcms/kcm_kwindecoration/contents
+%dir %{_datadir}/kpackage/kcms/kcm_kwindecoration/contents/ui
+%{_datadir}/kpackage/kcms/kcm_kwindecoration/contents/ui/ButtonGroup.qml
+%{_datadir}/kpackage/kcms/kcm_kwindecoration/contents/ui/Buttons.qml
+%{_datadir}/kpackage/kcms/kcm_kwindecoration/contents/ui/Themes.qml
+%{_datadir}/kpackage/kcms/kcm_kwindecoration/contents/ui/main.qml
+%{_datadir}/kpackage/kcms/kcm_kwindecoration/metadata.desktop
+%{_datadir}/kpackage/kcms/kcm_kwindecoration/metadata.json
+%attr(755,root,root) %{_libdir}/qt5/plugins/kcms/kcm_kwin_effects.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kcms/kcm_kwindecoration.so
+%attr(755,root,root) %{_datadir}/kconf_update/kwin-5.16-auto-bordersize.sh
+%{_datadir}/qlogging-categories5/org_kde_kwin.categories
+
+%attr(755,root,root) %{_bindir}/kwin_wayland_wrapper
+%{systemduserunitdir}/plasma-kwin_x11.service
+%attr(755,root,root) %ghost %{_libdir}/libkwineffects.so.13
+%attr(755,root,root) %ghost %{_libdir}/libkwinglutils.so.13
+%attr(755,root,root) %ghost %{_libdir}/libkwinxrenderutils.so.13
+%attr(755,root,root) %{_libdir}/qt5/plugins/kcms/kcm_kwinrules.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kwin/plugins/colordintegration.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kwin/plugins/krunnerintegration.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kwin/plugins/libKWinNightColorPlugin.so
+%{_datadir}/config.kcfg/kwindecorationsettings.kcfg
+%{_datadir}/config.kcfg/virtualdesktopssettings.kcfg
+%{_datadir}/dbus-1/interfaces/org.kde.KWin.Plugins.xml
+%attr(755,root,root) %{_datadir}/kconf_update/kwin-5.18-move-animspeed.py
+%attr(755,root,root) %{_datadir}/kconf_update/kwin-5.21-desktop-grid-click-behavior.py
+%attr(755,root,root) %{_datadir}/kconf_update/kwin-5.21-no-swap-encourage.py
+%attr(755,root,root) %{_datadir}/kconf_update/kwinrules-5.19-placement.pl
+%{_datadir}/kconf_update/kwinrules.upd
+%dir %{_datadir}/kpackage/kcms/kcm_kwinrules
+%dir %{_datadir}/kpackage/kcms/kcm_kwinrules/contents
+%dir %{_datadir}/kpackage/kcms/kcm_kwinrules/contents/ui
+%{_datadir}/kpackage/kcms/kcm_kwinrules/contents/ui/FileDialogLoader.qml
+%{_datadir}/kpackage/kcms/kcm_kwinrules/contents/ui/OptionsComboBox.qml
+%{_datadir}/kpackage/kcms/kcm_kwinrules/contents/ui/RuleItemDelegate.qml
+%{_datadir}/kpackage/kcms/kcm_kwinrules/contents/ui/RulesEditor.qml
+%{_datadir}/kpackage/kcms/kcm_kwinrules/contents/ui/RulesList.qml
+%{_datadir}/kpackage/kcms/kcm_kwinrules/contents/ui/ValueEditor.qml
+%{_datadir}/kpackage/kcms/kcm_kwinrules/metadata.desktop
+%{_datadir}/kpackage/kcms/kcm_kwinrules/metadata.json
+%dir %{_datadir}/krunner
+%dir %{_datadir}/krunner/dbusplugins
+%{_datadir}/krunner/dbusplugins/kwin-runner-windows.desktop
 
 %files devel
 %defattr(644,root,root,755)
@@ -233,3 +272,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libkwinglutils.so
 %attr(755,root,root) %{_libdir}/libkwinxrenderutils.so
 %{_libdir}/cmake/KWinDBusInterface
+%{_libdir}/cmake/KWinEffects