diff --git a/kdelibs-4.1.4-policykit-workaround.patch b/kdelibs-4.1.4-policykit-workaround.patch index 771e064..bdec7b3 100644 --- a/kdelibs-4.1.4-policykit-workaround.patch +++ b/kdelibs-4.1.4-policykit-workaround.patch @@ -1,7 +1,6 @@ -Pouze v kdelibs-4.1.4: kdelibs-4.1.3-policykit-workaround.patch -diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp ---- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp 2009-01-07 00:34:55.000000000 +0100 -+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp 2009-01-07 15:26:27.000000000 +0100 +diff -ur kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp +--- kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.cpp 2009-01-07 00:34:55.000000000 +0100 ++++ kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2009-01-08 05:56:56.000000000 +0100 @@ -17,10 +17,13 @@ */ @@ -38,7 +37,17 @@ diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1. m_teardownInProgress = false; emit teardownDone(Solid::UnauthorizedOperation, error.name()+": "+error.message(), -@@ -314,6 +327,59 @@ +@@ -259,7 +272,8 @@ + #else + QString uid="uid="; + #endif +- if (halOptions.contains(uid)) { ++ if (halOptions.contains(uid) ++ && (fstype == "vfat" || fstype == "iso9660" || fstype == "hfs" || fstype == "udf")) { + options << uid+QString::number(::getuid()); + } + +@@ -314,6 +328,59 @@ SLOT(slotDBusError(const QDBusError &))); } @@ -98,9 +107,9 @@ diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1. bool Solid::Backends::Hal::StorageAccess::callSystemMount() { const QString device = m_device->property("block.device").toString(); -diff -ur kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h ---- kdelibs-orig/solid/solid/backends/hal/halstorageaccess.h 2009-01-07 00:34:55.000000000 +0100 -+++ kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h 2009-01-07 15:26:27.000000000 +0100 +diff -ur kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h +--- kdelibs-4.1.4/solid/solid/backends/hal/halstorageaccess.h 2009-01-07 00:34:55.000000000 +0100 ++++ kdelibs-4.1.4-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h 2009-01-08 05:37:59.000000000 +0100 @@ -69,6 +69,9 @@ bool callSystemMount(); bool callSystemUnmount(); diff --git a/kdelibs.spec b/kdelibs.spec index 8c1ba69..5dd31e2 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.4 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -363,6 +363,9 @@ rm -rf %{buildroot} %changelog +* Thu Jan 08 2009 Kevin Kofler 4.1.4-2 +- restore AWOL NTFS workaround yet again + * Wed Jan 7 2009 Lukáš Tinkl 4.1.4-1 - KDE 4.1.4