rpms/kdelibs/devel kdelibs-4.0.1-autostart.patch, NONE, 1.1 kdelibs.spec, 1.264, 1.265

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29675

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.1-autostart.patch 
Log Message:
autostart from XDG_CONFIG_DIRS


kdelibs-4.0.1-autostart.patch:

--- NEW FILE kdelibs-4.0.1-autostart.patch ---
diff -up kdelibs-4.0.1/kinit/autostart.cpp.orig kdelibs-4.0.1/kinit/autostart.cpp
--- kdelibs-4.0.1/kinit/autostart.cpp.orig	2008-02-01 12:37:47.000000000 +0100
+++ kdelibs-4.0.1/kinit/autostart.cpp	2008-02-01 13:52:38.000000000 +0100
@@ -39,6 +39,12 @@ AutoStart::AutoStart()
 {
   m_startList = new AutoStartList;
   KGlobal::dirs()->addResourceType("autostart", 0, "share/autostart");
+  QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
+  if (xdgconf_dirs.isEmpty())
+         xdgconf_dirs = "/etc/xdg";
+  QStringList xdgconf_dirslist = QString(xdgconf_dirs).split(':');
+  for ( QStringList::Iterator d = xdgconf_dirslist.begin(); d != xdgconf_dirslist.end(); ++d )
+         KGlobal::dirs()->addResourceDir("autostart", (*d) + "/autostart");
 }
 
 AutoStart::~AutoStart()


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- kdelibs.spec	31 Jan 2008 12:52:43 -0000	1.264
+++ kdelibs.spec	1 Feb 2008 12:57:29 -0000	1.265
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -60,7 +60,7 @@
 Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
 # openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
 Patch6: kdelibs-4.0.0-openssl.patch
-
+Patch7: kdelibs-4.0.1-autostart.patch
 
 BuildRequires: qt4-devel >= 4.3.0
 Requires: qt4 >= %{_qt4_version} 
@@ -145,7 +145,7 @@
 # shouldn't be needed f9+, we'll see -- Rex
 %patch6 -p1 -b .openssl
 %endif
-
+%patch7 -p1 -b .xdg-autostart
 
 
 %build
@@ -274,6 +274,9 @@
 
 
 %changelog
+* Fri Feb 01 2008 Than Ngo <than at redhat.com> 4.0.1-2
+- autostart from XDG_CONFIG_DIRS
+
 * Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-1
 - 4.0.1