rpms/udev/devel udev-116-rhrules.patch, NONE, 1.1 .cvsignore, 1.46, 1.47 sources, 1.46, 1.47 udev.spec, 1.227, 1.228

[Harald Hoyer (harald)]

Author: harald

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

Modified Files:
	.cvsignore sources udev.spec 
Added Files:
	udev-116-rhrules.patch 
Log Message:
* Tue Jan 08 2008 Harald Hoyer <harald at redhat.com> 118-1
- version 118
- removed old USB compat rule (rhbz#424331)


udev-116-rhrules.patch:

--- NEW FILE udev-116-rhrules.patch ---
diff -up udev-116/etc/udev/redhat/40-redhat.rules.rhrules udev-116/etc/udev/redhat/40-redhat.rules
--- udev-116/etc/udev/redhat/40-redhat.rules.rhrules	2008-01-08 12:25:00.000000000 +0100
+++ udev-116/etc/udev/redhat/40-redhat.rules	2008-01-08 12:25:53.000000000 +0100
@@ -9,8 +9,6 @@ ACTION=="add", KERNEL=="sg[0-9]*", BUS==
 
 ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", ATTRS{type}=="8", SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk"
 
-ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
-
 BUS=="usb", KERNEL=="sd*", ATTRS{bInterfaceClass}=="08", ATTRS{bInterfaceSubClass}=="04", GROUP="floppy", MODE="0660", 	SYMLINK+="floppy floppy-%k"
 
 KERNEL=="fd[0-9]*",		SYMLINK+="floppy floppy-%k"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	15 Oct 2007 13:20:44 -0000	1.46
+++ .cvsignore	8 Jan 2008 13:29:53 -0000	1.47
@@ -1 +1 @@
-udev-116.tar.bz2
+udev-118.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	15 Oct 2007 13:20:44 -0000	1.46
+++ sources	8 Jan 2008 13:29:53 -0000	1.47
@@ -1 +1 @@
-02c49d93ffda4a104c853c082138b835  udev-116.tar.bz2
+39ab2404464c7026c65eb878827192b9  udev-118.tar.bz2


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- udev.spec	18 Oct 2007 19:50:31 -0000	1.227
+++ udev.spec	8 Jan 2008 13:29:53 -0000	1.228
@@ -5,8 +5,8 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 116
-Release: 3%{?dist}
+Version: 118
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -19,6 +19,7 @@
 Source4: fw_unit_symlinks.sh
 
 Patch1: udev-116-nettype.patch
+Patch2: udev-116-rhrules.patch
 
 Patch100: udev-089-nopie.patch
 Patch101: udev-091-lib64.patch
@@ -70,6 +71,7 @@
 %prep
 %setup -q  
 %patch1 -p1 -b .nettype
+%patch2 -p1 -b .rhrules
 %patch100 -p1 -b .nopie
 %patch101 -p1 -b .lib64
 
@@ -96,7 +98,8 @@
 	extras/floppy \
 	" all
 
-for i in udevd udevtrigger udevsettle \
+for i in udevd \
+	udevadm \
 	extras/scsi_id/scsi_id \
 	extras/ata_id/ata_id \
 	extras/edd_id/edd_id \
@@ -186,7 +189,7 @@
 	install -m 0755 $i.static $RPM_BUILD_ROOT%{udev_scriptdir}/$(basename $i).static
 done
 
-for i in udevd udevtrigger udevsettle; do
+for i in udevd udevadm; do
 	install -m 0755 $i.static $RPM_BUILD_ROOT/sbin/$i.static
 done
 %endif
@@ -281,9 +284,10 @@
 %defattr(-,root,root)
 %doc COPYING README TODO ChangeLog RELEASE-NOTES docs/* 
 %attr(0755,root,root) /sbin/udevcontrol
-%attr(0755,root,root) /sbin/udevd
+%attr(0755,root,root) /sbin/udevadm
 %attr(0755,root,root) /sbin/udevtrigger
 %attr(0755,root,root) /sbin/udevsettle
+%attr(0755,root,root) /sbin/udevd
 %attr(0755,root,root) /sbin/start_udev
 %attr(0755,root,root) /sbin/scsi_id
 %attr(0755,root,root) %{udev_scriptdir}/scsi_id
@@ -338,8 +342,7 @@
 %files static
 %doc COPYING
 %attr(0755,root,root) /sbin/udevd.static
-%attr(0755,root,root) /sbin/udevtrigger.static
-%attr(0755,root,root) /sbin/udevsettle.static
+%attr(0755,root,root) /sbin/udevadm.static
 %attr(755,root,root) %{udev_scriptdir}/scsi_id.static
 %attr(755,root,root) %{udev_scriptdir}/ata_id.static
 %attr(755,root,root) %{udev_scriptdir}/edd_id.static
@@ -361,6 +364,10 @@
 %{_libdir}/pkgconfig/libvolume_id.pc 
 
 %changelog
+* Tue Jan 08 2008 Harald Hoyer <harald at redhat.com> 118-1
+- version 118
+- removed old USB compat rule (rhbz#424331)
+
 * Thu Oct 18 2007 Harald Hoyer <harald at redhat.com> 116-3
 - fixed preun chkconfig
 - added /sbin path to chkconfig in post section