[libdrm/f15] Revert "Fix udev rule matching and install path (#748205)"

[Adam Jackson]

commit 148eac265e5775215fe182870f02c2a2615b8417
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 25 13:46:23 2011 -0400

    Revert "Fix udev rule matching and install path (#748205)"
    
    Only intended to do this on F17
    
    This reverts commit 70e59c89f17613b19e812de792b2ad5d4398229d.

 91-drm-modeset.rules |    2 +-
 libdrm.spec          |   11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/91-drm-modeset.rules b/91-drm-modeset.rules
index f1bb5ec..650acc3 100644
--- a/91-drm-modeset.rules
+++ b/91-drm-modeset.rules
@@ -1 +1 @@
-KERNEL=="controlD[0-9]*", SUBSYSTEM=="drm", MODE="0600"
+KERNEL=="controlD[0-9]*",	NAME="dri/%k", MODE="0600"
diff --git a/libdrm.spec b/libdrm.spec
index 417f217..7f6c282 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.26
-Release: 3%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -75,8 +75,8 @@ for foo in $(make check-programs) ; do
 done
 popd
 # SUBDIRS=libdrm
-mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/lib/udev/rules.d/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/
 
 # NOTE: We intentionally don't ship *.la files
 find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
@@ -104,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdrm_radeon.so.1.0.0
 %{_libdir}/libdrm_nouveau.so.1
 %{_libdir}/libdrm_nouveau.so.1.0.0
-/lib/udev/rules.d/91-drm-modeset.rules
+%config %{_sysconfdir}/udev/rules.d/91-drm-modeset.rules
 
 %files -n drm-utils
 %defattr(-,root,root,-)
@@ -150,9 +150,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libkms.pc
 
 %changelog
-* Tue Oct 25 2011 Adam Jackson <ajax at redhat.com> 2.4.26-3
-- Fix udev rule matching and install path (#748205)
-
 * Fri Oct 21 2011 Dave Airlie <airlied at redhat.com> 2.4.26-2
 - fix perms on control node in udev rule