From 151534bd46d252a3f8541fc9ff8dcced4518b8ac34aab9de51cb5e9644ca90e7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 2 Apr 2024 10:56:47 +0000 Subject: [PATCH] Accepting request 1164074 from home:AdaLovelace:branches:KDE:Frameworks - Add "-DBUILD_KCM_MOUSE_X11=OFF" for s390x - Move touchpad and mouse configuration to all (also for s390x) OBS-URL: https://build.opensuse.org/request/show/1164074 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-desktop?expand=0&rev=18 --- plasma6-desktop.changes | 6 ++++++ plasma6-desktop.spec | 27 +++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/plasma6-desktop.changes b/plasma6-desktop.changes index 36e2e8d..7e15687 100644 --- a/plasma6-desktop.changes +++ b/plasma6-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 1 18:21:06 UTC 2024 - Sarah Kriesch + +- Add "-DBUILD_KCM_MOUSE_X11=OFF" for s390x +- Move touchpad and mouse configuration to all (also for s390x) + ------------------------------------------------------------------- Tue Mar 26 18:06:11 UTC 2024 - Fabian Vogt diff --git a/plasma6-desktop.spec b/plasma6-desktop.spec index c6f9bc5..ecfdaca 100644 --- a/plasma6-desktop.spec +++ b/plasma6-desktop.spec @@ -233,7 +233,8 @@ Plasma 6 Input Method Backend for SCIM (Smart Chinese/Common Input Method) suppo %build %cmake_kf6 \ %ifarch s390x - -DBUILD_KCM_TOUCHPAD_X11:BOOL=FALSE + -DBUILD_KCM_TOUCHPAD_X11:BOOL=FALSE \ + -DBUILD_KCM_MOUSE_X11=OFF %endif %kf6_build @@ -242,9 +243,7 @@ Plasma 6 Input Method Backend for SCIM (Smart Chinese/Common Input Method) suppo %kf6_install # no devel files needed here -%ifnarch s390x rm -rv %{buildroot}%{_kf6_sharedir}/dbus-1/interfaces/ -%endif %find_lang %{name} --all-name --with-html @@ -282,6 +281,8 @@ rm -rv %{buildroot}%{_kf6_sharedir}/dbus-1/interfaces/ %{_kf6_applicationsdir}/kcmspellchecking.desktop %{_kf6_applicationsdir}/kde-mimeapps.list %{_kf6_applicationsdir}/org.kde.knetattach.desktop +%{_kf6_applicationsdir}/kcm_mouse.desktop +%{_kf6_applicationsdir}/kcm_touchpad.desktop %{_kf6_appstreamdir}/*.xml %{_kf6_bindir}/kaccess %{_kf6_bindir}/knetattach @@ -302,6 +303,7 @@ rm -rv %{buildroot}%{_kf6_sharedir}/dbus-1/interfaces/ %{_kf6_plugindir}/attica_kde.so %{_kf6_plugindir}/kf6/kded/device_automounter.so %{_kf6_plugindir}/kf6/kded/keyboard.so +%{_kf6_plugindir}/kf6/kded/kded_touchpad.so %{_kf6_plugindir}/kf6/krunner/ %dir %{_kf6_plugindir}/plasma/kcms/desktop/ %{_kf6_plugindir}/plasma/kcms/desktop/kcm_krunnersettings.so @@ -313,6 +315,11 @@ rm -rv %{buildroot}%{_kf6_sharedir}/dbus-1/interfaces/ %if %{with gamecontroller_kcm} %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_gamecontroller.so %endif +%dir %{_kf6_plugindir}/plasma/kcminit +%{_kf6_plugindir}/plasma/kcminit/kcm_mouse_init.so +%{_kf6_plugindir}/plasma/kcminit/kcm_touchpad_init.so +%{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_mouse.so +%{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_touchpad.so %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_kded.so %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_keyboard.so %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_keys.so @@ -345,21 +352,13 @@ rm -rv %{buildroot}%{_kf6_sharedir}/dbus-1/interfaces/ %{_kf6_sharedir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy %{_kf6_sharedir}/solid/ %{_kf6_libexecdir}/kauth/kcmdatetimehelper +%{_kf6_iconsdir}/hicolor/*/devices/input-touchpad.* +%{_kf6_sharedir}/kcmmouse/ +%{_kf6_notificationsdir}/kcm_touchpad.notifyrc %exclude %{_kf6_plasmadir}/emoji/ %ifnarch s390 s390x -%{_kf6_applicationsdir}/kcm_mouse.desktop -%{_kf6_applicationsdir}/kcm_touchpad.desktop %{_kf6_bindir}/kapplymousetheme %{_kf6_bindir}/kcm-touchpad-list-devices -%{_kf6_iconsdir}/hicolor/*/devices/input-touchpad.* -%{_kf6_notificationsdir}/kcm_touchpad.notifyrc -%{_kf6_plugindir}/kf6/kded/kded_touchpad.so -%dir %{_kf6_plugindir}/plasma/kcminit -%{_kf6_plugindir}/plasma/kcminit/kcm_mouse_init.so -%{_kf6_plugindir}/plasma/kcminit/kcm_touchpad_init.so -%{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_mouse.so -%{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_touchpad.so -%{_kf6_sharedir}/kcmmouse/ %endif %files emojier