rpms/kdebase/devel kdebase-3.5.4-kde#124116.patch, NONE, 1.1 kdebase.spec, 1.211, 1.212

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Aug 15 09:51:36 UTC 2006


Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv867

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-kde#124116.patch 
Log Message:
apply upstream patch to fix argument quoting


kdebase-3.5.4-kde#124116.patch:
 main.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.4-kde#124116.patch ---
Index: ksystraycmd/main.cpp
===================================================================
--- ksystraycmd/main.cpp	(Revision 572102)
+++ ksystraycmd/main.cpp	(Revision 572103)
@@ -5,6 +5,7 @@
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <kprocess.h>
 
 #include "ksystraycmd.h"
 
@@ -94,7 +95,7 @@
   // Read the command
   QString command;
   for ( int i = 0; i < args->count(); i++ )
-    command += QCString( args->arg(i) ) + " ";
+    command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " ";
   if ( !command.isEmpty() )
       cmd.setCommand( command );
 


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- kdebase.spec	8 Aug 2006 11:47:38 -0000	1.211
+++ kdebase.spec	15 Aug 2006 09:51:34 -0000	1.212
@@ -18,7 +18,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -56,6 +56,7 @@
 # upstream patches
 Patch100: kdebase-3.5.4-halbackend-dbus.patch
 Patch101: kdebase-3.5.4-kde#128552.patch
+Patch102: kdebase-3.5.4-kde#124116.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -163,6 +164,7 @@
 # upstream patches
 %patch100 -p0 -b .halbackend-dbus
 %patch101 -p0 -b .kde#128552
+%patch102 -p0 -b .kde#124116
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -532,6 +534,9 @@
 %exclude %{_libdir}/libkdeinit_*
 
 %changelog
+* Tue Aug 15 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
+- apply upstream patch to fix argument quoting
+
 * Tue Aug 08 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - apply upstream patch to fix KDED crashing on startup when D-BUS is unavailable.
 - apply upstream patch to fix kde#128552, kicker regression




More information about the fedora-cvs-commits mailing list