rpms/udev/devel udev-114-strg.patch, NONE, 1.1 udev-114+git-fcfeda.patch, 1.1, 1.2 udev.spec, 1.213, 1.214

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3330

Modified Files:
	udev-114+git-fcfeda.patch udev.spec 
Added Files:
	udev-114-strg.patch 
Log Message:
- fixed isapnp rule (bug #251815)
- fix for nikon cameras (bug #251401)


udev-114-strg.patch:

--- NEW FILE udev-114-strg.patch ---
--- udev-114/etc/udev/rules.d/60-persistent-storage.rules.strg	2007-08-05 14:08:47.000000000 +0200
+++ udev-114/etc/udev/rules.d/60-persistent-storage.rules	2007-08-13 10:33:37.000000000 +0200
@@ -59,7 +59,7 @@
 KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
 
 # by-label/by-uuid (filesystem properties)
-IMPORT{program}="vol_id --export $tempnode"
+ENV{DEVTYPE}=="partition", IMPORT{program}="vol_id --export $tempnode"
 ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
 ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
 

udev-114+git-fcfeda.patch:

Index: udev-114+git-fcfeda.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-114+git-fcfeda.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-114+git-fcfeda.patch	10 Aug 2007 14:38:10 -0000	1.1
+++ udev-114+git-fcfeda.patch	13 Aug 2007 08:39:12 -0000	1.2
@@ -524,7 +524,7 @@
 +
 +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODALIAS}"
 +SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
-+  RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
++  RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
 +SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
 +SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
 +SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- udev.spec	10 Aug 2007 14:37:15 -0000	1.213
+++ udev.spec	13 Aug 2007 08:39:12 -0000	1.214
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 114
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,7 +19,8 @@
 Source4: fw_unit_symlinks.sh
 
 Patch1: udev-rules.patch
-Patch3: udev-114+git-fcfeda.patch
+Patch2: udev-114+git-fcfeda.patch
+Patch3: udev-114-strg.patch
 Patch7: udev-089-nopie.patch
 Patch9: udev-091-lib64.patch
 
@@ -70,7 +71,8 @@
 %prep
 %setup -q  
 %patch1 -p1 -b .rhrules
-%patch3 -p1 -b .git
+%patch2 -p1 -b .git
+%patch3 -p1 -b .strg
 %patch7 -p1 -b .nopie
 %patch9 -p1 -b .lib64
 
@@ -351,6 +353,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Mon Aug 13 2007 Harald Hoyer <harald at redhat.com> - 114-2
+- fixed isapnp rule (bug #251815)
+- fix for nikon cameras (bug #251401)
+
 * Fri Aug 10 2007 Harald Hoyer <harald at redhat.com> - 114-1
 - version 114
 - big rule unification and cleanup