rpms/kdelibs/devel kdelibs-4.0.x-kio.patch, NONE, 1.1 kdelibs.spec, 1.285, 1.286

Than Ngo (than) fedora-extras-commits at redhat.com
Thu Mar 6 10:29:55 UTC 2008


Author: than

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

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.0.x-kio.patch 
Log Message:
apply upstream patch to fix issue in KPropertiesDialog


kdelibs-4.0.x-kio.patch:

--- NEW FILE kdelibs-4.0.x-kio.patch ---
Index: kio/kfile/kopenwithdialog.cpp
===================================================================
--- kio/kfile/kopenwithdialog.cpp	(Revision 782244)
+++ kio/kfile/kopenwithdialog.cpp	(Revision 782245)
@@ -870,7 +870,7 @@
             KConfigGroup cg = desktopFile.desktopGroup();
             cg.writeEntry("Type", "Application");
             cg.writeEntry("Name", initialServiceName);
-            cg.writePathEntry("Exec", fullExec);
+            cg.writeEntry("Exec", fullExec);
             cg.writeEntry("NoDisplay", true); // don't make it appear in the K menu
             if (terminal->isChecked()) {
                 cg.writeEntry("Terminal", true);
Index: kio/kfile/kpropertiesdialog.cpp
===================================================================
--- kio/kfile/kpropertiesdialog.cpp	(Revision 782244)
+++ kio/kfile/kpropertiesdialog.cpp	(Revision 782245)
@@ -3015,7 +3015,7 @@
   QString nameStr = _config.readName();
   QString genNameStr = _config.readGenericName();
   QString commentStr = _config.readComment();
-  QString commandStr = config.readPathEntry( "Exec", QString() );
+  QString commandStr = config.readEntry( "Exec", QString() );
   if (commandStr.startsWith(QLatin1String("ksystraycmd ")))
   {
     commandStr.remove(0, 12);
@@ -3176,9 +3176,9 @@
   config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigGroup::Persistent|KConfigGroup::Localized ); // for compat
 
   if (d->m_systrayBool)
-    config.writePathEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") );
+    config.writeEntry( "Exec", d->w->commandEdit->text().prepend("ksystraycmd ") );
   else
-    config.writePathEntry( "Exec", d->w->commandEdit->text() );
+    config.writeEntry( "Exec", d->w->commandEdit->text() );
   config.writePathEntry( "Path", d->w->pathEdit->lineEdit()->text() );
 
   // Write mimeTypes


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- kdelibs.spec	6 Mar 2008 04:21:20 -0000	1.285
+++ kdelibs.spec	6 Mar 2008 10:29:15 -0000	1.286
@@ -3,7 +3,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -65,6 +65,7 @@
 Patch8: kdelibs-4.0.2-install-all-css.patch
 
 # upstream patches
+Patch100: kdelibs-4.0.x-kio.patch
 
 BuildRequires: qt4-devel >= 4.3.0
 Requires: qt4 >= %{_qt4_version} 
@@ -175,6 +176,7 @@
 %patch8 -p1 -b .all-css
 
 # upstream patches
+%patch100 -p0 -b .kio
 
 %build
 
@@ -323,6 +325,9 @@
 
 
 %changelog
+* Thu Mar 06 2008 Than Ngo <than at redhat.com> 4.0.2-6
+- apply upstream patch to fix issue in KPropertiesDialog
+
 * Thu Mar 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-5
 - also install Doxyfile.global in -common to build kdepimlibs-apidocs against
 




More information about the fedora-extras-commits mailing list