rpms/kdelibs/FC-6 kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch, NONE, 1.1 kdelibs.spec, 1.200, 1.201

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8674

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch 
Log Message:
apply upstream patch to support XDG_MENU_PREFIX


kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch:
 vfolder_menu.cpp |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch ---
Index: kded/vfolder_menu.cpp
===================================================================
--- kded/vfolder_menu.cpp	(Revision 603272)
+++ kded/vfolder_menu.cpp	(Revision 603273)
@@ -772,9 +772,29 @@
       return QString::null;
    }
 
-   QString baseName = QDir::cleanDirPath(m_docInfo.baseDir + fileName);
-   QString result = locate("xdgconf-menu", baseName);
+   QString result;
 
+   QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
+   if (!xdgMenuPrefix.isEmpty())
+   {
+      QFileInfo fileInfo(fileName);
+
+      QString fileNameOnly = fileInfo.fileName();
+      if (!fileNameOnly.startsWith(xdgMenuPrefix))
+         fileNameOnly = xdgMenuPrefix + fileNameOnly;
+
+      QString baseName = QDir::cleanDirPath(m_docInfo.baseDir +
+                                            fileInfo.dirPath() + "/" +
+                                            fileNameOnly);
+      result = locate("xdgconf-menu", baseName);
+   }
+
+   if (result.isEmpty())
+   {
+       QString baseName = QDir::cleanDirPath(m_docInfo.baseDir + fileName);
+       result = locate("xdgconf-menu", baseName);
+   }
+
    return result;
 }
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-6/kdelibs.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- kdelibs.spec	26 Oct 2006 22:04:08 -0000	1.200
+++ kdelibs.spec	7 Dec 2006 15:40:45 -0000	1.201
@@ -16,7 +16,7 @@
 %define make_cvs 0
 
 Version: 3.5.5
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -48,6 +48,7 @@
 # upstream patches
 Patch100: kdelibs-3.5.5-kmcupsmanager.patch
 Patch101: kdelibs-3.5.5-kde#135988.patch
+Patch102: kdelibs-3.5.5-vfolder-xdgMenuPrefix.patch
 
 # security fixes
 Patch500: kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch
@@ -177,6 +178,7 @@
 # upstream pathces
 %patch100 -p1 -b .kmcupsmanager
 %patch101 -p0 -b .kde#135988
+%patch102 -p0 -b .vfolder-xdgMenuPrefix
 
 # security fixes
 %patch500 -p1 -b .CVE-2006-4811
@@ -402,6 +404,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Thu Dec 07 2006 Than Ngo <than at redhat.com> - 6:3.5.5-0.3
+- apply upstream patch to support XDG_MENU_PREFIX
+
 * Fri Oct 27 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.2
 - add missing api docs