rpms/kdebase-runtime/devel kdebase-runtime-4.3.0-nepomuk-autostart.patch, NONE, 1.1 kdebase-runtime.spec, 1.124, 1.125

[Lukas Tinkl]

Author: ltinkl

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

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


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

--- NEW FILE kdebase-runtime-4.3.0-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/devel/kdebase-runtime.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- kdebase-runtime.spec	25 Jun 2009 16:14:44 -0000	1.124
+++ kdebase-runtime.spec	29 Jun 2009 19:31:59 -0000	1.125
@@ -3,7 +3,7 @@
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.2.95
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
@@ -17,6 +17,7 @@ Patch0:        kdebase-runtime-4.1.70-pu
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
+Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 
 ## Upstream patches
 
@@ -93,7 +94,7 @@ BuildArch: noarch
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
-
+%patch4 -p1 -b .nepomuk-autostart
 
 %build
 mkdir -p %{_target_platform}
@@ -213,6 +214,9 @@ fi
 
 
 %changelog
+* Mon Jun 29 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.95-2
+- don't start nepomuk server unconditionally (#487322)
+
 * Thu Jun 25 2009 Than Ngo <than at redhat.com> - 4.2.95-1
 - 4.3rc1