[krusader] * Tue May 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.0-0.3.beta1 - Fix kdesu invocation for k

[Kevin Kofler]

commit ff19ee4a8035dcb11728f4d1cb506ebe2fe65a65
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Tue May 24 17:27:04 2011 +0200

    * Tue May 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.0-0.3.beta1
    - Fix kdesu invocation for kdebase-runtime 4.6 (#705870, kde#271264)

 krusader-2.3.0-beta1-kdesu.patch |   12 ++++++++++++
 krusader.spec                    |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/krusader-2.3.0-beta1-kdesu.patch b/krusader-2.3.0-beta1-kdesu.patch
new file mode 100644
index 0000000..9726435
--- /dev/null
+++ b/krusader-2.3.0-beta1-kdesu.patch
@@ -0,0 +1,12 @@
+diff -ur krusader-2.3.0-beta1/krusader/krslots.cpp krusader-2.3.0-beta1-kdesu/krusader/krslots.cpp
+--- krusader-2.3.0-beta1/krusader/krslots.cpp	2010-12-25 23:37:52.000000000 +0100
++++ krusader-2.3.0-beta1-kdesu/krusader/krslots.cpp	2011-05-24 17:10:57.000000000 +0200
+@@ -519,7 +519,7 @@
+     }
+ 
+     KProcess proc;
+-    proc << KrServices::fullPathName("kdesu") << KrServices::fullPathName("krusader")
++    proc << KrServices::fullPathName("kdesu") << "-c" << KrServices::fullPathName("krusader")
+     + " --left=" + MAIN_VIEW->left->func->files()->vfs_getOrigin().url()
+     + " --right=" + MAIN_VIEW->right->func->files()->vfs_getOrigin().url();
+ 
diff --git a/krusader.spec b/krusader.spec
index d4b7aa1..46f845d 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,7 +1,7 @@
 Name:		krusader
 Version:	2.3.0
 %global beta beta1
-Release:	0.2.%{beta}%{?dist}
+Release:	0.3.%{beta}%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -11,6 +11,9 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{b
 # adds default MIME type handlers for (tar.)lzma legacy archives
 # fixes bz2 (non-tar) MIME type
 Patch0:		krusader-2.3.0-beta1-default-mimetypes.patch
+# fix kdesu invocation for kdebase-runtime 4.6 (#705870, kde#271264)
+# https://bugs.kde.org/show_bug.cgi?id=271264
+Patch1:		krusader-2.3.0-beta1-kdesu.patch
 # upstream patches:
 # http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=a2db0b0fb5f58d0d648a362f75e3948f49cc87fc
 # adds XZ support to KrArc and the packing/unpacking functionality (#593525)
@@ -38,6 +41,7 @@ friendly, fast and looks great on your desktop! You should give it a try.
 
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+%patch1 -p1 -b .kdesu
 %patch100 -p1 -b .xz
 # apply this one after the upstream patch since it touches the same file
 %patch0 -p1 -b .mimetypes
@@ -98,6 +102,9 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/kde4/services/*.protocol
 
 %changelog
+* Tue May 24 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.3.0-0.3.beta1
+- Fix kdesu invocation for kdebase-runtime 4.6 (#705870, kde#271264)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-0.2.beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild