rpms/udev/F-12 0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch, NONE, 1.1 udev.spec, 1.298, 1.299

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/udev/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7846

Modified Files:
	udev.spec 
Added Files:
	0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch 
Log Message:
* Wed Nov 11 2009 Bastien Nocera <bnocera at redhat.com> 145-14
- Fix blu-ray and hd-dvd drives not getting detected properly
  when a medium is absent
- Fix upgrade from Fedora 11 with bluez installed (#533925)


0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch:
 cdrom_id.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch ---
>From 7505831b7ee7b04d84424d2ed306a76abd32871c Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Tue, 10 Nov 2009 12:32:38 -0500
Subject: [PATCH] cdrom_id: Still check profiles even if there is no media

Even when there is no medium in the drive, we should still check the
profiles supported by the drive. Otherwise we fail to detect things
like Blu-ray drives. See

 https://bugzilla.gnome.org/show_bug.cgi?id=600273

for more information.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
 extras/cdrom_id/cdrom_id.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 6ea763b..2380b15 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -583,9 +583,9 @@ int main(int argc, char *argv[])
 		goto exit;
 	}
 
-	/* check for media */
-	if (cd_media_compat(udev, fd) < 0)
-		goto print;
+	/* check for media - don't bail if there's no media as we still need to
+         * to read profiles */
+	cd_media_compat(udev, fd);
 
 	/* check if drive talks MMC */
 	if (cd_inquiry(udev, fd) < 0)
-- 
1.6.5.2



Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/F-12/udev.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- udev.spec	5 Nov 2009 13:08:44 -0000	1.298
+++ udev.spec	11 Nov 2009 13:10:12 -0000	1.299
@@ -5,7 +5,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 145
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -23,9 +23,11 @@ Patch6: ck-runseat.patch
 Patch7: udev-141-cpu-online.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=532628
 Patch8: udev-145-hid2hci-backport.patch
-Patch9: udev-145-modem-modeswitch.patch
 BuildRequires: libtool automake autoconf
 
+Patch9: udev-145-modem-modeswitch.patch
+Patch10; 0001-cdrom_id-Still-check-profiles-even-if-there-is-no-me.patch
+
 Source1: start_udev
 Source3: udev-post.init
 Source4: fw_unit_symlinks.sh
@@ -56,6 +58,8 @@ Obsoletes: dev <= 0:3.12-1
 Provides: dev = 0:3.12-2
 Obsoletes: DeviceKit < 004
 Obsoletes: DeviceKit-devel < 004
+# hid2hci moved to udev
+Conflicts: bluez < 4.47
 
 %description
 The udev package contains an implementation of devfs in 
@@ -117,6 +121,7 @@ glib-based applications using libudev fu
 %patch7 -p1 
 %patch8 -p1 -b .hid2hci
 %patch9 -p1
+%patch10 -p1
 autoreconf -i
 automake
 
@@ -363,6 +368,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Wed Nov 11 2009 Bastien Nocera <bnocera at redhat.com> 145-14
+- Fix blu-ray and hd-dvd drives not getting detected properly
+  when a medium is absent
+- Fix upgrade from Fedora 11 with bluez installed (#533925)
+
 * Thu Nov 05 2009 Harald Hoyer <harald at redhat.com> 145-13
 - obsolete DeviceKit and DeviceKit-devel (#532961)
 - add NEWS file to the doc section