Install YaST-systemsettings.desktop for Plasma 6, remove it for KDE 4

yast · Sep 26, 2024 · a457886 · a457886
1 parent f6d1b2a
commit a457886
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/package/yast2-control-center.changes b/package/yast2-control-center.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 26 11:21:09 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Install YaST-systemsettings.desktop into location for Plasma 6,
+  remove installation into KDE 4 location
+- 5.0.1
+
 -------------------------------------------------------------------
 Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <jreidinger@suse.cz>
 

diff --git a/package/yast2-control-center.spec b/package/yast2-control-center.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-control-center
-Version:        5.0.0
+Version:        5.0.1
 Release:        0
 Url:            https://github.com/yast/yast-control-center
 Summary:        YaST2 - Control Center
@@ -98,17 +98,17 @@ make install DESTDIR=%{buildroot}
 cd ..
 
 %suse_update_desktop_file -G "Administrator Settings"  %{buildroot}%{_datadir}/applications/org.opensuse.YaST.desktop Core-System X-SuSE-ControlCenter-System X-GNOME-SystemSettings
-%suse_update_desktop_file %{buildroot}%{_datadir}/kde4/services/YaST-systemsettings.desktop
 
 %files
 %dir %{_datadir}/metainfo
 %{_datadir}/metainfo/org.opensuse.YaST.appdata.xml
 %{_datadir}/applications/org.opensuse.YaST.desktop
-%dir %{_datadir}/kde4/
-%dir %{_datadir}/kde4/services
-%{_datadir}/kde4/services/YaST-systemsettings.desktop
 %dir %{_datadir}/kservices5
 %{_datadir}/kservices5/YaST-systemsettings.desktop
+%dir %{_datadir}/plasma/
+%dir %{_datadir}/plasma/systemsettings/
+%dir %{_datadir}/plasma/systemsettings/externalmodules/
+%{_datadir}/plasma/systemsettings/externalmodules/YaST-systemsettings.desktop
 %{yast_icondir}
 
 %files qt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -59,8 +59,8 @@ INSTALL(TARGETS y2controlcenter DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/YaST2/bi
 
 INSTALL(DIRECTORY icons DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ )
 INSTALL(FILES org.opensuse.YaST.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications )
-INSTALL(FILES YaST-systemsettings.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kde4/services )
 INSTALL(FILES YaST-systemsettings.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5 )
+INSTALL(FILES YaST-systemsettings.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/plasma/systemsettings/externalmodules )
 INSTALL(FILES org.opensuse.YaST.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo )
 
 SET(MODELS_TEST_SRCS