Merge branch 'f17' into f16

kdelibs-4.8-solid_cd_eject.patch

@@ -0,0 +1,13 @@
+--- a/solid/solid/backends/udisks/udisksstorageaccess.cpp	
++++ a/solid/solid/backends/udisks/udisksstorageaccess.cpp	
+@@ -172,7 +172,9 @@ void UDisksStorageAccess::slotDBusReply( const QDBusMessage & reply )
+             m_teardownInProgress = false;
+             m_device->broadcastActionDone("teardown");
+ 
+-            if (m_device->prop("DriveIsMediaEjectable").toBool() && !m_device->prop("DeviceIsOpticalDisc").toBool()) // optical drives have their Eject method
++            if (m_device->prop("DriveIsMediaEjectable").toBool() &&
++                    m_device->prop("DeviceIsMediaAvailable").toBool() &&
++                    !m_device->prop("DeviceIsOpticalDisc").toBool()) // optical drives have their Eject method
+             {
+                 QString devnode = m_device->prop("DeviceFile").toString();
+ 

kdelibs.spec

@@ -25,7 +25,7 @@
 
 Summary: KDE Libraries
 Version: 4.8.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -145,6 +145,11 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
 # return valid locale (RFC 1766)
 Patch54: kdelibs-4.8.4-kjs-locale.patch
 
+# CD drive tray goes back in after 'Eject' when dolphin is running
+# http://bugs.kde.org/296657
+# http://bugzilla.redhat.com/811609
+Patch55:  kdelibs-4.8-solid_cd_eject.patch
+
 ## upstream
 # fix kdeclarative install location (by wstephenson as found in kde-packager list)
 Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch
@@ -619,6 +624,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 13 2012 Rex Dieter <rdieter@fedoraproject.org> - 6:4.8.4-8
+- CD drive tray goes back in after 'Eject' when dolphin is running (kde#296657, #811609)
+
 * Thu Jul 12 2012 Than Ngo <than@redhat.com> - 6:4.8.4-7
 - fix kjs to return valid lang (RFC 1766)