rpms/kdebase-runtime/F-11 kdebase-runtime-4.2.5-nepomuk-autostart.patch, NONE, 1.1 kdebase-runtime.spec, 1.113, 1.114

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15749/F-11

Modified Files:
	kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.2.5-nepomuk-autostart.patch 
Log Message:
don't start nepomuk server unconditionally (#487322)


kdebase-runtime-4.2.5-nepomuk-autostart.patch:

--- NEW FILE kdebase-runtime-4.2.5-nepomuk-autostart.patch ---
Index: runtime/nepomuk/server/nepomukserver.desktop
===================================================================
--- runtime/nepomuk/server/nepomukserver.desktop	(revision 989226)
+++ runtime/nepomuk/server/nepomukserver.desktop	(working copy)
@@ -2,6 +2,7 @@
 Type=Service
 Exec=nepomukserver
 X-KDE-StartupNotify=false
+X-KDE-autostart-condition=nepomukserverrc:Basic Settings:Start Nepomuk:true
 OnlyShowIn=KDE;
 X-KDE-autostart-phase=0
 Name=Nepomuk Server


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- kdebase-runtime.spec	30 May 2009 10:33:34 -0000	1.113
+++ kdebase-runtime.spec	29 Jun 2009 19:31:58 -0000	1.114
@@ -8,7 +8,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -21,6 +21,7 @@ Patch0:        kdebase-runtime-4.1.70-pu
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
+Patch4:        kdebase-runtime-4.2.5-nepomuk-autostart.patch
 
 ## Upstream patches
 # http://bugs.kde.org/186340
@@ -127,6 +128,7 @@ BuildArch: noarch
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
+%patch4 -p1 -b .nepomuk-autostart
 
 # upstream patches
 %patch100 -p1 -b .kde#186340
@@ -390,6 +392,9 @@ fi
 
 
 %changelog
+* Mon Jun 29 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-2
+- don't start nepomuk server unconditionally (#487322)
+
 * Fri May 29 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
 - KDE 4.2.4