rpms/DeviceKit-disks/F-11 devkit-disks-004-ignore-pc-floppy-drives.patch, NONE, 1.1 DeviceKit-disks.spec, 1.25, 1.26

[David Zeuthen]

Author: davidz

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

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	devkit-disks-004-ignore-pc-floppy-drives.patch 
Log Message:
* Thu Jul 02 2009 David Zeuthen <davidz at redhat.com> - 004-4%{?dist}
- Ignore PC floppy drives (#489083)



devkit-disks-004-ignore-pc-floppy-drives.patch:

--- NEW FILE devkit-disks-004-ignore-pc-floppy-drives.patch ---
--- DeviceKit-disks-004/src/devkit-disks-device.c.orig	2009-07-02 10:24:59.000000000 -0400
+++ DeviceKit-disks-004/src/devkit-disks-device.c	2009-07-02 10:26:38.000000000 -0400
@@ -3437,7 +3437,8 @@
 
         /* ignore ram and loop devices */
         if (g_str_has_prefix (native_path, "/sys/devices/virtual/block/ram") ||
-            g_str_has_prefix (native_path, "/sys/devices/virtual/block/loop"))
+            g_str_has_prefix (native_path, "/sys/devices/virtual/block/loop") ||
+            g_str_has_prefix (native_path, "/sys/devices/platform/floppy"))
                 goto out;
 
         device = DEVKIT_DISKS_DEVICE (g_object_new (DEVKIT_DISKS_TYPE_DEVICE, NULL));


Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-11/DeviceKit-disks.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- DeviceKit-disks.spec	19 May 2009 21:54:49 -0000	1.25
+++ DeviceKit-disks.spec	2 Jul 2009 14:32:41 -0000	1.26
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 004
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit-disks.git;a=summary
@@ -60,6 +60,7 @@ Requires: ntfsprogs
 Conflicts: kernel < 2.6.26
 
 Patch0: avoid-ata-smart-check-for-removable-disks.patch
+Patch1: devkit-disks-004-ignore-pc-floppy-drives.patch
 
 %description
 DeviceKit-disks provides a daemon, D-Bus API and command line tools
@@ -78,6 +79,7 @@ D-Bus interface definitions for DeviceKi
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Thu Jul 02 2009 David Zeuthen <davidz at redhat.com> - 004-4%{?dist}
+- Ignore PC floppy drives (#489083)
+
 * Tue May 19 2009 David Zeuthen <davidz at redhat.com> - 004-3%{?dist}
 - Avoid checking whether device is ATA SMART capable if the device reports
   removable media (#494932)