rpms/kdebase/devel kdebase-3.5.7-kio_media_mounthelper.patch, NONE, 1.1 kdebase.spec, 1.264, 1.265

[Than Ngo (than)]

Author: than

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

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.7-kio_media_mounthelper.patch 
Log Message:
fix bz#265801, fuser command not found by kio_media_mounthelper


kdebase-3.5.7-kio_media_mounthelper.patch:

--- NEW FILE kdebase-3.5.7-kio_media_mounthelper.patch ---
--- kdebase-3.5.7/kioslave/media/mediamanager/halbackend.cpp.orig	2007-08-30 14:45:33.000000000 +0200
+++ kdebase-3.5.7/kioslave/media/mediamanager/halbackend.cpp	2007-08-30 15:03:16.000000000 +0200
@@ -990,8 +990,11 @@
 
 QString HALBackend::listUsingProcesses(const Medium* medium)
 {
-    QString proclist, fullmsg;
-    QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+    QString proclist, fullmsg, cmdline;
+    if(QFile::exists("/sbin/fuser"))
+       cmdline = QString("/sbin/fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
+    else
+       cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
     FILE *fuser = popen(cmdline.latin1(), "r");
 
     uint counter = 0;


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- kdebase.spec	16 Aug 2007 17:08:51 -0000	1.264
+++ kdebase.spec	30 Aug 2007 13:31:10 -0000	1.265
@@ -18,7 +18,7 @@
 Name:    kdebase
 Epoch:   6
 Version: 3.5.7
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 # programs: GPLv2, libs: LGPLv2
 # a lot(most/all?) of files are +, but we'll be conservative, for now. -- Rex
@@ -69,10 +69,13 @@
 Patch27: kdebase-3.5.6-consolekit-kdm.patch
 Patch28: kdebase-3.5.6-kdm-alternatebackground.patch
 Patch29: kdebase-3.5.7-bz#244906.patch
+Patch30: kdebase-3.5.7-kio_media_mounthelper.patch
 
 # upstream patches
 # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-Patch83974: kdebase-3.5.7-kde#83974.patch
+Patch200: kdebase-3.5.7-kde#83974.patch
+
+# security patches
 # http://www.kde.org/info/security/advisory-20070815-1.txt
 Patch502: ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-konqueror.diff
 
@@ -227,8 +230,10 @@
 %{?_with_hal:%patch27 -p1 -b .consolekit}
 %patch28 -p1 -b .kdm-alternatebackground
 %patch29 -p1 -b .konsole-bz#244906
+%patch30 -p1 -b .bz#265801
+
 ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
-#patch83974 -p4 -b .kde#83974
+#patch200 -p4 -b .kde#83974
 
 %patch502 -p0 -b .advisory-20070815-1
 
@@ -639,6 +644,9 @@
 
 
 %changelog
+* Thu Aug 30 2007 Than Ngo <than at redhat.com> - 6:3.5.7-14
+- fix bz#265801, fuser command not found by kio_media_mounthelper
+
 * Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-13
 - CVE-2007-3820, CVE-2007-4224, CVE-2007-4225
 - License: GPLv2 and LGPLv2