rpms/kdebase/F-8 kdebase-3.5.9-userdiskmount.patch, 1.1, 1.2 kdebase.spec, 1.293, 1.294
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Thu Mar 27 04:18:02 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12323/F-8
Modified Files:
kdebase-3.5.9-userdiskmount.patch kdebase.spec
Log Message:
Sync from kdebase3/devel:
- fix the patch to actually build
kdebase-3.5.9-userdiskmount.patch:
Index: kdebase-3.5.9-userdiskmount.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase-3.5.9-userdiskmount.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.9-userdiskmount.patch 27 Mar 2008 02:29:36 -0000 1.1
+++ kdebase-3.5.9-userdiskmount.patch 27 Mar 2008 04:17:50 -0000 1.2
@@ -1,6 +1,6 @@
diff -ur kdebase-3.5.9/kioslave/media/mediamanager/halbackend.cpp kdebase-3.5.9-userdiskmount/kioslave/media/mediamanager/halbackend.cpp
--- kdebase-3.5.9/kioslave/media/mediamanager/halbackend.cpp 2008-02-13 10:40:36.000000000 +0100
-+++ kdebase-3.5.9-userdiskmount/kioslave/media/mediamanager/halbackend.cpp 2008-03-27 02:59:34.000000000 +0100
++++ kdebase-3.5.9-userdiskmount/kioslave/media/mediamanager/halbackend.cpp 2008-03-27 04:59:21.000000000 +0100
@@ -20,6 +20,7 @@
#include "linuxcdpolling.h"
@@ -148,7 +148,7 @@
QString qerror, reason;
+ if (!strcmp(error.name, "org.freedesktop.Hal.Device.PermissionDeniedByPolicy")) {
-+ qerror = privilegedUnmount(udi.latin1());
++ qerror = privilegedUnmount(udi);
+
+ if (qerror.isEmpty()) {
+ dbus_message_unref(dmesg);
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -r1.293 -r1.294
--- kdebase.spec 27 Mar 2008 03:46:01 -0000 1.293
+++ kdebase.spec 27 Mar 2008 04:17:50 -0000 1.294
@@ -803,6 +803,7 @@
%changelog
* Thu Mar 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-7
- actually apply the patch (on F8+ only, not needed on F7)
+- fix the patch to actually build
* Thu Mar 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-6
- apply modified Kubuntu patch to fix mounting NTFS partitions (#378041)
More information about the fedora-extras-commits
mailing list