rpms/kdelibs3/F-9 kdelibs-3.5.9-KDE3.patch, NONE, 1.1 kdelibs3.spec, 1.25, 1.26

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs3/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31181

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.9-KDE3.patch 
Log Message:
kresources.desktop: use OnlyShowIn=KDE3


kdelibs-3.5.9-KDE3.patch:

--- NEW FILE kdelibs-3.5.9-KDE3.patch ---
diff -up kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservice.cpp
--- kdelibs-3.5.9/kio/kio/kservice.cpp.KDE3	2008-02-13 03:41:06.000000000 -0600
+++ kdelibs-3.5.9/kio/kio/kservice.cpp	2008-05-15 15:36:13.000000000 -0500
@@ -701,7 +701,7 @@ bool KService::noDisplay() const {
   {
      QString aValue = it.data().toString();
      QStringList aList = QStringList::split(';', aValue);
-     if (!aList.contains("KDE"))
+     if (!(aList.contains("KDE") || aList.contains("KDE3")) )
         return true;
   }
 
@@ -710,7 +710,7 @@ bool KService::noDisplay() const {
   {
      QString aValue = it.data().toString();
      QStringList aList = QStringList::split(';', aValue);
-     if (aList.contains("KDE"))
+     if (aList.contains("KDE") || aList.contains("KDE3"))
         return true;
   }
   
diff -up kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3 kdelibs-3.5.9/kio/kio/kservicegroup.cpp
--- kdelibs-3.5.9/kio/kio/kservicegroup.cpp.KDE3	2007-05-14 02:52:35.000000000 -0500
+++ kdelibs-3.5.9/kio/kio/kservicegroup.cpp	2008-05-15 15:39:34.000000000 -0500
@@ -76,12 +76,14 @@ KServiceGroup::KServiceGroup( const QStr
   QStringList tmpList;
   if (config.hasKey("OnlyShowIn"))
   {
-     if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
+     QStringList onlyShowInList = config.readListEntry("OnlyShowIn", ';');
+     if (! (onlyShowInList.contains("KDE") || onlyShowInList.contains("KDE3")))
         d->m_bNoDisplay = true;
   }
   if (config.hasKey("NotShowIn"))
   {
-     if (config.readListEntry("NotShowIn", ';').contains("KDE"))
+     QStringList notShowInList = config.readListEntry("NotShowIn", ';');
+     if (! (notShowInList.contains("KDE") || notShowInList.contains("KDE3")))
         d->m_bNoDisplay = true;
   }
 


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/F-9/kdelibs3.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kdelibs3.spec	15 May 2008 20:54:16 -0000	1.25
+++ kdelibs3.spec	15 May 2008 21:06:31 -0000	1.26
@@ -428,7 +428,7 @@
 rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
 rm -rf %{buildroot}%{_datadir}/autostart/
 # don't show kresources
-echo "NoDisplay=true" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
+sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop 
 %endif
 
 %if 0%{?include_crystalsvg} == 0