Author: lmontel
Date: Mon Feb 5 09:08:35 2007
New Revision: 116184
Modified:
packages/cooker/kdebase/current/SOURCES/kdebase-3.5.3-fix-media-fuser.patch
packages/cooker/kdebase/current/SPECS/kdebase.spec
Log:
Readd fuser patch
Modified:
packages/cooker/kdebase/current/SOURCES/kdebase-3.5.3-fix-media-fuser.patch
==============================================================================
--- packages/cooker/kdebase/current/SOURCES/kdebase-3.5.3-fix-media-fuser.patch
(original)
+++ packages/cooker/kdebase/current/SOURCES/kdebase-3.5.3-fix-media-fuser.patch
Mon Feb 5 09:08:35 2007
@@ -1,11 +1,11 @@
---- kdebase-3.5.3/kioslave/media/mediamanager/halbackend.cpp-- 2006-07-11
18:00:39.000000000 +0200
-+++ kdebase-3.5.3/kioslave/media/mediamanager/halbackend.cpp 2006-07-11
18:00:57.000000000 +0200
-@@ -1161,7 +1161,7 @@
- QString qerror = error.message;
- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) {
- qerror = QString("<qt>") + i18n("Device is Busy:");
-- QString cmdline = QString("/usr/bin/env fuser -vm %1
2>&1").arg(KProcess::quote(medium->mountPoint()));
-+ QString cmdline = QString("/usr/bin/env /sbin/fuser -vm %1
2>&1").arg(KProcess::quote(medium->mountPoint()));
- FILE *fuser = popen(cmdline.latin1(), "r");
- uint counter = 0;
- if (fuser) {
+--- kdebase-3.5.6/kioslave/media/mediamanager/halbackend.cpp-- 2007-02-05
09:05:15.000000000 +0100
++++ kdebase-3.5.6/kioslave/media/mediamanager/halbackend.cpp 2007-02-05
09:05:22.000000000 +0100
+@@ -1008,7 +1008,7 @@
+ 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 cmdline = QString("/usr/bin/env /sbin/fuser -vm %1
2>&1").arg(KProcess::quote(medium->mountPoint()));
+ FILE *fuser = popen(cmdline.latin1(), "r");
+
+ uint counter = 0;
Modified: packages/cooker/kdebase/current/SPECS/kdebase.spec
==============================================================================
--- packages/cooker/kdebase/current/SPECS/kdebase.spec (original)
+++ packages/cooker/kdebase/current/SPECS/kdebase.spec Mon Feb 5 09:08:35 2007
@@ -1586,7 +1586,7 @@
%patch32 -p1 -b .dont_use_strict_info2html
%patch37 -p1 -b .desktop_button_icon_mdk
%patch39 -p1 -b .krun_icon
-#%patch40 -p1 -b .fix_media_fuser_path
+%patch40 -p1 -b .fix_media_fuser_path
%patch42 -p0 -b .fix_about_mandrake
%patch43 -p1 -b .add_multimedia_keyboard_to_konqueror
%patch48 -p0 -b .merge_mdk_dir
