rpms/kdelibs/devel kdelibs-4.0.x-kio.patch, 1.1, 1.2 kdelibs.spec, 1.287, 1.288

[Than Ngo (than)]

Author: than

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

Modified Files:
	kdelibs-4.0.x-kio.patch kdelibs.spec 
Log Message:
fix kdelibs-4.0.x-kio.patch


kdelibs-4.0.x-kio.patch:

Index: kdelibs-4.0.x-kio.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs-4.0.x-kio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.0.x-kio.patch	6 Mar 2008 10:29:15 -0000	1.1
+++ kdelibs-4.0.x-kio.patch	6 Mar 2008 11:36:25 -0000	1.2
@@ -1,21 +1,19 @@
-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 @@
+diff -up kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp
+--- kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp.kio	2008-01-05 01:00:16.000000000 +0100
++++ kdelibs-4.0.2/kio/kfile/kopenwithdialog.cpp	2008-03-06 12:34:08.000000000 +0100
+@@ -879,7 +879,7 @@ void KOpenWithDialogPrivate::_k_slotOK()
+   KConfigGroup cg = desktop->desktopGroup();
+   cg.writeEntry("Type", "Application");
+   cg.writeEntry("Name", initialServiceName);
+-  cg.writePathEntry("Exec", fullExec);
++  cg.writeEntry("Exec", fullExec);
+   if (terminal->isChecked())
+   {
+     cg.writeEntry("Terminal", true);
+diff -up kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp
+--- kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp.kio	2008-01-31 00:54:05.000000000 +0100
++++ kdelibs-4.0.2/kio/kfile/kpropertiesdialog.cpp	2008-03-06 12:31:52.000000000 +0100
+@@ -3015,7 +3015,7 @@ KDesktopPropsPlugin::KDesktopPropsPlugin
    QString nameStr = _config.readName();
    QString genNameStr = _config.readGenericName();
    QString commentStr = _config.readComment();
@@ -24,7 +22,7 @@
    if (commandStr.startsWith(QLatin1String("ksystraycmd ")))
    {
      commandStr.remove(0, 12);
-@@ -3176,9 +3176,9 @@
+@@ -3176,9 +3176,9 @@ void KDesktopPropsPlugin::applyChanges()
    config.writeEntry( "GenericName", d->w->genNameEdit->text(), KConfigGroup::Persistent|KConfigGroup::Localized ); // for compat
  
    if (d->m_systrayBool)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -r1.287 -r1.288
--- kdelibs.spec	6 Mar 2008 11:16:10 -0000	1.287
+++ kdelibs.spec	6 Mar 2008 11:36:25 -0000	1.288
@@ -176,7 +176,7 @@
 %patch8 -p1 -b .all-css
 
 # upstream patches
-%patch100 -p0 -b .kio
+%patch100 -p1 -b .kio
 
 %build