Mailinglist Archive: yast-commit (1535 mails)

[kmachalkova@xxxxxxxxxxxxxxxx]

Author: kmachalkova
Date: Tue Oct 20 11:55:37 2009
New Revision: 59108

URL: http://svn.opensuse.org/viewcvs/yast?rev=59108&view=rev
Log:
.desktop split into system-wide and kde-specific
one (to prevent using xdg-su from within KDE CC)

Added:
    trunk/control-center/src/YaST-systemsettings.desktop
Modified:
    trunk/control-center/src/CMakeLists.txt
    trunk/control-center/src/YaST.desktop
    trunk/control-center/yast2-control-center.spec.in

Modified: trunk/control-center/src/CMakeLists.txt
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/CMakeLists.txt?rev=59108&r1=59107&r2=59108&view=diff
==============================================================================
--- trunk/control-center/src/CMakeLists.txt (original)
+++ trunk/control-center/src/CMakeLists.txt Tue Oct 20 11:55:37 2009
@@ -75,6 +75,7 @@
 
 INSTALL(FILES yast.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
 INSTALL(FILES YaST.desktop DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/applications )
+INSTALL(FILES YaST-systemsettings.desktop DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/kde4/services )
 
 SET(MODELS_TEST_SRCS
   models_test.cpp

Added: trunk/control-center/src/YaST-systemsettings.desktop
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/YaST-systemsettings.desktop?rev=59108&view=auto
==============================================================================
--- trunk/control-center/src/YaST-systemsettings.desktop (added)
+++ trunk/control-center/src/YaST-systemsettings.desktop Tue Oct 20 11:55:37 
2009
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Service
+Name=YaST
+Icon=yast
+GenericName=Administrator Settings
+Exec=/sbin/yast2
+X-KDE-RootOnly=true
+X-KDE-System-Settings-Parent-Category=system
+X-KDE-ServiceTypes=KCModule
+

Modified: trunk/control-center/src/YaST.desktop
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/YaST.desktop?rev=59108&r1=59107&r2=59108&view=diff
==============================================================================
--- trunk/control-center/src/YaST.desktop (original)
+++ trunk/control-center/src/YaST.desktop Tue Oct 20 11:55:37 2009
@@ -5,9 +5,4 @@
 Icon=yast
 GenericName=Control Center
 Exec=/usr/bin/xdg-su -c /sbin/yast2
-#OnlyShowIn=KDE;GNOME;
-#X-KDE-SubstituteUID=true
-X-KDE-RootOnly=true
-X-KDE-System-Settings-Parent-Category=system
-X-KDE-ServiceTypes=KCModule
 Encoding=UTF-8

Modified: trunk/control-center/yast2-control-center.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/control-center/yast2-control-center.spec.in?rev=59108&r1=59107&r2=59108&view=diff
==============================================================================
--- trunk/control-center/yast2-control-center.spec.in (original)
+++ trunk/control-center/yast2-control-center.spec.in Tue Oct 20 11:55:37 2009
@@ -48,15 +48,20 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 cd ..
 
-%suse_update_desktop_file -G "Administrator Settings" YaST SystemSetup 
Core-System X-SuSE-ControlCenter-System
+
+%suse_update_desktop_file -G "Administrator Settings"  
%{buildroot}%{_datadir}/applications/YaST.desktop Core-System 
X-SuSE-ControlCenter-System
+%suse_update_desktop_file 
%{buildroot}%{_datadir}/kde4/services/YaST-systemsettings.desktop 
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
-/usr/share/applications/YaST.desktop
-/usr/share/pixmaps/yast.png
+%{_datadir}/applications/YaST.desktop
+%dir %{_datadir}/kde4/
+%dir %{_datadir}/kde4/services
+%{_datadir}/kde4/services/YaST-systemsettings.desktop
+%{_datadir}/pixmaps/yast.png
 
 %files qt
 %defattr(-,root,root)

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx