rpms/udev/devel udev-rules.patch,1.36,1.37 udev.spec,1.205,1.206

[Harald Hoyer (harald)]

Author: harald

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

Modified Files:
	udev-rules.patch udev.spec 
Log Message:
- added more firewire symlinks (#240770)
- minor rule patches


udev-rules.patch:

Index: udev-rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-rules.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- udev-rules.patch	27 Jun 2007 08:32:59 -0000	1.36
+++ udev-rules.patch	3 Jul 2007 10:18:00 -0000	1.37
@@ -1,5 +1,43 @@
+--- udev-113/etc/udev/redhat/50-udev.rules.rhrules	2007-06-27 12:46:40.000000000 +0200
++++ udev-113/etc/udev/redhat/50-udev.rules	2007-07-03 12:15:25.000000000 +0200
+@@ -4,7 +4,7 @@
+ # default is OWNER="root" GROUP="root", MODE="0600"
+ #
+ 
+-KERNEL=="*", OWNER="root" GROUP="root", MODE="0600"
++KERNEL=="*", OWNER="root", GROUP="root", MODE="0600"
+ 
+ # all block devices
+ SUBSYSTEM=="block",		GROUP="disk", MODE="0640"
+@@ -72,7 +72,7 @@
+ KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M /dev/%k"
+ KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f /dev/%k*'"
+ 
+-BUS=="usb", KERNEL=="sd*", SYSFS{bInterfaceClass}=="08", SYSFS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", SYMLINK+="floppy floppy-%k"
++BUS=="usb", KERNEL=="sd*", ATTRS{bInterfaceClass}=="08", ATTRS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", SYMLINK+="floppy floppy-%k"
+ 
+ # audio devices
+ KERNEL=="dsp*",			MODE="0660"
+@@ -99,7 +99,7 @@
+ KERNEL=="usb/lp*",		GROUP="lp", MODE="0660"
+ 
+ # tape devices
+-SUBSYSTEM=="ide", SYSFS{media}=="tape", ACTION=="add", \
++SUBSYSTEM=="ide", ATTRS{media}=="tape", ACTION=="add", \
+ 		RUN+="modprobe ide-scsi idescsi_nocd=1"
+ KERNEL=="ht*",			GROUP="disk", MODE="0660"
+ KERNEL=="nht*",			GROUP="disk", MODE="0660"
+@@ -181,6 +181,8 @@
+ KERNEL=="dv1394*",      	NAME="dv1394/%n"
+ KERNEL=="video1394*",   	NAME="video1394/%n"
+ 
++KERNEL=="fw*", PROGRAM="fw_unit_symlinks.sh %k %n", SYMLINK+="$result"
++
+ KERNEL=="raw[0-9]*",		NAME="raw/%k"
+ 
+ KERNEL=="lp[0-9]*",		SYMLINK+="par%n"
 --- udev-113/etc/udev/redhat/05-udev-early.rules.rhrules	2007-06-23 17:44:48.000000000 +0200
-+++ udev-113/etc/udev/redhat/05-udev-early.rules	2007-06-26 16:52:47.000000000 +0200
++++ udev-113/etc/udev/redhat/05-udev-early.rules	2007-06-27 10:26:40.000000000 +0200
 @@ -12,7 +12,8 @@
  
  ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- udev.spec	27 Jun 2007 08:32:59 -0000	1.205
+++ udev.spec	3 Jul 2007 10:18:00 -0000	1.206
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 113
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -16,7 +16,7 @@
 Source1: start_udev
 Source2: udev.nodes
 Source3: modprobe
-
+Source4: fw_unit_symlinks.sh
 Source10: firmware_helper.c
 
 Patch1: udev-permconv.patch
@@ -198,6 +198,7 @@
 
 install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/50-udev.nodes
 install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{udev_scriptdir}/modprobe
+install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{udev_scriptdir}/fw_unit_symlinks.sh
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev
@@ -288,6 +289,7 @@
 %attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh
 %attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh
 %attr(0755,root,root) %{udev_scriptdir}/modprobe
+%attr(0755,root,root) %{udev_scriptdir}/fw_unit_symlinks.sh
 
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/05-udev-early.rules
@@ -342,6 +344,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Wed Jun 27 2007 Harald Hoyer <harald at redhat.com> - 113-2
+- added more firewire symlinks (#240770)
+- minor rule patches
+
 * Tue Jun 26 2007 Harald Hoyer <harald at redhat.com> - 113-1
 - version 113
 - added rule for SD cards in a TI FlashMedia slot (#217070)