[kdelibs] also fix removing 2-stage devices

[Lukas Tinkl]

commit 411209b447a0e484b9cc5d0ee5d683f324041d83
Author: Lukáš Tinkl <lukas at kde.org>
Date:   Thu Feb 7 14:40:09 2013 +0100

    also fix removing 2-stage devices

 kdelibs-udisks2_2_stage.patch |   18 ++++++++++++++----
 kdelibs.spec                  |    5 ++++-
 2 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/kdelibs-udisks2_2_stage.patch b/kdelibs-udisks2_2_stage.patch
index d81f967..a92e7f9 100644
--- a/kdelibs-udisks2_2_stage.patch
+++ b/kdelibs-udisks2_2_stage.patch
@@ -1,7 +1,8 @@
-diff -up kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2_stage kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp
---- kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2_stage	2013-01-23 15:44:27.000000000 -0600
-+++ kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp	2013-02-01 09:43:49.032367743 -0600
-@@ -203,6 +203,10 @@ void Manager::slotInterfacesAdded(const
+diff --git a/solid/solid/backends/udisks2/udisksmanager.cpp b/solid/solid/backends/udisks2/udisksmanager.cpp
+index ecb9add..a73cb32 100644
+--- a/solid/solid/backends/udisks2/udisksmanager.cpp
++++ b/solid/solid/backends/udisks2/udisksmanager.cpp
+@@ -203,6 +203,10 @@ void Manager::slotInterfacesAdded(const QDBusObjectPath &object_path, const QVar
          m_deviceCache.append(udi);
          Q_EMIT deviceAdded(udi);
      }
@@ -12,3 +13,12 @@ diff -up kdelibs-4.10.0/solid/solid/backends/udisks2/udisksmanager.cpp.udisks2_2
  }
  
  void Manager::slotInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces)
+@@ -222,7 +222,7 @@ void Manager::slotInterfacesRemoved(const QDBusObjectPath &object_path, const QS
+ 
+     Device device(udi);
+ 
+-    if (!udi.isEmpty() && (interfaces.isEmpty() || device.interfaces().isEmpty() || device.interfaces().contains(UD2_DBUS_INTERFACE_FILESYSTEM))) {
++    if (!udi.isEmpty() && (interfaces.isEmpty() || device.interfaces().isEmpty() || interfaces.contains(UD2_DBUS_INTERFACE_FILESYSTEM))) {
+         Q_EMIT deviceRemoved(udi);
+         m_deviceCache.removeAll(udi);
+         DeviceBackend::destroyBackend(udi);
diff --git a/kdelibs.spec b/kdelibs.spec
index 95ba69f..e4c0fb8 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -23,7 +23,7 @@
 
 Summary: KDE Libraries
 Version: 4.10.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -555,6 +555,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Thu Feb 07 2013 Lukáš Tinkl <ltinkl at redhat.com> 6:4.10.0-3
+- complete kdelibs-udisks2_2_stage.patch
+
 * Tue Feb 05 2013 Rex Dieter <rdieter at fedoraproject.org> 6:4.10.0-2
 - kdelibs-udisks2_2_stage.patch (fix for some phones/mtp-device detection)