rpms/udev/devel udev-136-cdrom.patch, NONE, 1.1 udev-136-tape.patch, NONE, 1.1 udev-136-video.patch, NONE, 1.1 udev.spec, 1.259, 1.260

[Harald Hoyer]

Author: harald

Update of /cvs/pkgs/rpms/udev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16106

Modified Files:
	udev.spec 
Added Files:
	udev-136-cdrom.patch udev-136-tape.patch udev-136-video.patch 
Log Message:
* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-2
- added some rule fixes, which will be in udev-137


udev-136-cdrom.patch:

--- NEW FILE udev-136-cdrom.patch ---
commit 18cff5c3b2e3591fa46107288ea2d7026a15ccf3
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Sat Jan 10 17:44:09 2009 +0100

    rules: fix typo in ide cd rule
    
    Thanks to Scott, who found that.

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 119941b..7730f0d 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -68,7 +68,7 @@ KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitio
 
 # cdrom
 SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
-SUBSYSTEM=="block", KERNEL=="hd[0-9]*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
+SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
 SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
 KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"

udev-136-tape.patch:

--- NEW FILE udev-136-tape.patch ---
commit 8b739dec53f8bca23e46e2d2a9732abee9b8d591
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Jan 10 01:37:03 2009 +0100

    fix naming for tape nst devices in /dev/tape/by-path/
    
    $env{ID_PATH} includes the "-nst" suffix anyway, so we shouldn't append
    it a second time as part of the rule creating the device file symlink.
    
    Signed-off-by: Lennart Poettering <lennart at poettering.net>

diff --git a/rules/rules.d/60-persistent-storage-tape.rules b/rules/rules.d/60-persistent-storage-tape.rules
index d3226f1..8d53888 100644
--- a/rules/rules.d/60-persistent-storage-tape.rules
+++ b/rules/rules.d/60-persistent-storage-tape.rules
@@ -19,6 +19,6 @@ KERNEL=="nst*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$en
 # by-path (parent device path)
 KERNEL=="st*[0-9]|nst*[0-9]", IMPORT{program}="path_id %p"
 KERNEL=="st*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
-KERNEL=="nst*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}-nst"
+KERNEL=="nst*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
 
 LABEL="persistent_storage_tape_end"

udev-136-video.patch:

--- NEW FILE udev-136-video.patch ---
commit 66d9b44f8302efe383ada6a52d8431655614bf76
Author: Kay Sievers <kay.sievers at vrfy.org>
Date:   Thu Jan 15 17:06:14 2009 +0100

    rules: add drm devices to group "video"
    
    https://bugs.launchpad.net/bugs/317430

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 7730f0d..95d82d7 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -38,6 +38,7 @@ KERNEL=="card[0-9]*",		NAME="dri/%k"
 KERNEL=="pmu",			GROUP="video"
 KERNEL=="nvidia*|nvidiactl*",	GROUP="video"
 SUBSYSTEM=="graphics",		GROUP="video"
+SUBSYSTEM=="drm",		GROUP="video"
 
 # DVB (video)
 SUBSYSTEM=="dvb", ENV{DVB_ADAPTER_NUM}=="?*", NAME="dvb/adapter$env{DVB_ADAPTER_NUM}/$env{DVB_DEVICE_TYPE}$env{DVB_DEVICE_NUM}", GROUP="video"


Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- udev.spec	20 Jan 2009 11:58:53 -0000	1.259
+++ udev.spec	20 Jan 2009 12:17:14 -0000	1.260
@@ -6,7 +6,7 @@
 Summary: A userspace implementation of devfs
 Name: udev
 Version: 136
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Provides: udev-persistent = %{version}-%{release}
@@ -18,6 +18,10 @@
 Source4: fw_unit_symlinks.sh
 Source5: udev.sysconfig
 
+Patch1: udev-136-tape.patch
+Patch2: udev-136-cdrom.patch
+Patch3: udev-136-video.patch
+
 Patch102: udev-118-sysconf.patch
 
 ExclusiveOS: Linux
@@ -90,6 +94,10 @@
 
 %prep
 %setup -q  
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
 %patch102 -p1 -b .sysconf
 rm rules/redhat/95-pam-console.rules
 
@@ -378,6 +386,9 @@
 
 
 %changelog
+* Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-2
+- added some rule fixes, which will be in udev-137
+
 * Tue Jan 20 2009 Harald Hoyer <harald at redhat.com> 136-1
 - test for restorecon in start_udev before it is used (bug #480608)
 - added groups video audio cdrom tape dialout in post