rpms/DeviceKit-disks/F-11 devkit-disks-004-parse-audio.patch, NONE, 1.1 DeviceKit-disks.spec, 1.26, 1.27

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8792

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	devkit-disks-004-parse-audio.patch 
Log Message:
* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 004-5%{?dist}
- fixed audio CD handling (#513495)


devkit-disks-004-parse-audio.patch:
 devkit-disks-device.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE devkit-disks-004-parse-audio.patch ---
diff -up DeviceKit-disks-004/src/devkit-disks-device.c.orig DeviceKit-disks-004/src/devkit-disks-device.c
--- DeviceKit-disks-004/src/devkit-disks-device.c.orig	2009-10-09 16:50:37.000000000 +0200
+++ DeviceKit-disks-004/src/devkit-disks-device.c	2009-10-09 16:52:18.000000000 +0200
@@ -2142,7 +2142,7 @@ update_info_optical_disc (DevkitDisksDev
         gint cdrom_session_count;
 
         /* device_is_optical_disc and optical_disc_* */
-        if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA_STATE")) {
+        if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA")) {
                 devkit_disks_device_set_device_is_optical_disc (device, TRUE);
 
                 cdrom_track_count = 0;
@@ -2152,7 +2152,7 @@ update_info_optical_disc (DevkitDisksDev
                 if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT"))
                         cdrom_track_count = devkit_device_get_property_as_int (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT");
                 if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT_AUDIO"))
-                        cdrom_track_count_audio = devkit_device_get_property_as_int (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT");
+                        cdrom_track_count_audio = devkit_device_get_property_as_int (device->priv->d, "ID_CDROM_MEDIA_TRACK_COUNT_AUDIO");
                 if (devkit_device_has_property (device->priv->d, "ID_CDROM_MEDIA_SESSION_COUNT"))
                         cdrom_session_count = devkit_device_get_property_as_int (device->priv->d, "ID_CDROM_MEDIA_SESSION_COUNT");
                 devkit_disks_device_set_optical_disc_num_tracks (device, cdrom_track_count);


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/DeviceKit-disks.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- DeviceKit-disks.spec	2 Jul 2009 14:32:41 -0000	1.26
+++ DeviceKit-disks.spec	19 Oct 2009 22:20:45 -0000	1.27
@@ -4,7 +4,7 @@
 %define devicekit_version       002
 %define polkit_version          0.8
 %define parted_version          1.8.8
-%define udev_version            139
+%define udev_version            141-4
 %define mdadm_version           2.6.7
 %define device_mapper_version   1.02
 %define libatasmart_version     0.12
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -61,6 +61,7 @@ Conflicts: kernel < 2.6.26
 
 Patch0: avoid-ata-smart-check-for-removable-disks.patch
 Patch1: devkit-disks-004-ignore-pc-floppy-drives.patch
+Patch2: devkit-disks-004-parse-audio.patch
 
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
@@ -80,6 +81,7 @@ D-Bus interface definitions for DeviceKi
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -137,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Fri Oct 09 2009 Harald Hoyer <harald at redhat.com> 004-5%{?dist}
+- fixed audio CD handling (#513495)
+
 * Thu Jul 02 2009 David Zeuthen <davidz at redhat.com> - 004-4%{?dist}
 - Ignore PC floppy drives (#489083)