rpms/kdelibs4/F-8 kdelibs-4.1.3-policykit-workaround.patch,1.1,1.2

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv966/F-8

Modified Files:
	kdelibs-4.1.3-policykit-workaround.patch 
Log Message:
Fix patch.

kdelibs-4.1.3-policykit-workaround.patch:

Index: kdelibs-4.1.3-policykit-workaround.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-8/kdelibs-4.1.3-policykit-workaround.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdelibs-4.1.3-policykit-workaround.patch	8 Dec 2008 01:15:23 -0000	1.1
+++ kdelibs-4.1.3-policykit-workaround.patch	8 Dec 2008 01:35:24 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
 --- kdelibs-4.1.3/solid/solid/backends/hal/halstorageaccess.cpp	2008-10-30 14:24:05.000000000 +0100
-+++ kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp	2008-12-08 02:07:20.000000000 +0100
++++ kdelibs-4.1.3-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp	2008-12-08 02:31:43.000000000 +0100
 @@ -17,10 +17,13 @@
  
  */
@@ -37,7 +37,14 @@
          m_teardownInProgress = false;
          emit teardownDone(Solid::UnauthorizedOperation,
                            error.name()+": "+error.message(),
-@@ -241,7 +254,8 @@
+@@ -235,17 +248,18 @@
+                                                       "Mount");
+     QStringList options;
+     QStringList halOptions = m_device->property("volume.mount.valid_options").toStringList();
++    QString fstype=m_device->property("volume.fstype").toString();
+ 
+ #ifdef Q_OS_FREEBSD
+     QString uid="-u=";
  #else
      QString uid="uid=";
  #endif
@@ -47,6 +54,10 @@
          options << uid+QString::number(::getuid());
      }
  
+-    QString fstype=m_device->property("volume.fstype").toString();
+ #ifdef Q_OS_FREEBSD
+     char *cType;
+     if ( fstype=="vfat" && halOptions.contains("-L=")) {
 @@ -297,6 +311,59 @@
                                SLOT(slotDBusError(const QDBusError &)));
  }