rpms/kdelibs/F-7 kdelibs-3.5.7-autostart.patch, NONE, 1.1 kdelibs.spec, 1.220, 1.221

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdelibs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23782

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.7-autostart.patch 
Log Message:
fix rh#243611, autostart from XDG_CONFIG_DIRS


kdelibs-3.5.7-autostart.patch:

--- NEW FILE kdelibs-3.5.7-autostart.patch ---
--- kdelibs-3.5.7/kinit/autostart.cpp.orig	2007-09-25 11:32:07.000000000 +0200
+++ kdelibs-3.5.7/kinit/autostart.cpp	2007-09-25 14:14:29.000000000 +0200
@@ -48,6 +48,12 @@ AutoStart::AutoStart( bool new_startup )
   m_startList = new AutoStartList;
   m_startList->setAutoDelete(true);
   KGlobal::dirs()->addResourceType("autostart", "share/autostart");
+  QString xdgconf_dirs = KGlobal::dirs()->kfsstnd_xdg_conf_prefixes();
+  if (xdgconf_dirs.isEmpty())
+	  xdgconf_dirs = "/etc/xdg";
+  QStringList xdgconf_dirslist = QStringList::split( ':', xdgconf_dirs );
+  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/F-7/kdelibs.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- kdelibs.spec	1 Sep 2007 17:40:32 -0000	1.220
+++ kdelibs.spec	25 Sep 2007 12:54:55 -0000	1.221
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment - Libraries
 Version: 3.5.7
-Release: 22%{?dist}
+Release: 22.1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -60,6 +60,7 @@
 Patch41: kdelibs-3.5.6-utempter.patch
 Patch43: kdelibs-3.5.6-lang.patch
 Patch44: kdelibs-3.5.7-cups13.patch
+Patch45: kdelibs-3.5.7-autostart.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -78,7 +79,7 @@
 # http://www.kde.org/info/security/advisory-20070815-1.txt
 Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdelibs-kdecore.diff
 # vcard30 patch, http://bugs.kde.org/115219
-Patch115219: kdelibs-3.5.7-kde#115219.patch
+Patch503: kdelibs-3.5.7-kde#115219.patch
 
 %{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
@@ -229,6 +230,7 @@
 %{?_with_libutempter:%patch41 -p1 -b .utempter}
 %patch43 -p1 -b .lang
 %patch44 -p1 -b .cups13
+%patch45 -p1 -b .xdg-autostart
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -238,7 +240,7 @@
 %patch500 -p0 -b .kde#146105
 %patch501 -p4 -b .rh#244065
 %patch502 -p0 -b .advisory-20070815-1
-%patch115219 -p1 -b .kde#115219
+%patch503 -p1 -b .kde#115219
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -521,6 +523,9 @@
 
 
 %changelog
+* Tue Sep 25 2007 Than Ngo <than at redhat.com> - 6:3.5.7-22.1
+- fix rh#243611, autostart from XDG_CONFIG_DIRS
+
 * Sat Sep 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.7-22
 - Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
   (allows using the old /opt/kde4 versions for now)