From 84f0b5de282af927cf03bf05d1f0ca96b4ed9a6b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 25 Oct 2011 13:48:20 -0400 Subject: [PATCH] Fix udev rule matching and install location (#748205) --- 91-drm-modeset.rules | 2 +- libdrm.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/91-drm-modeset.rules b/91-drm-modeset.rules index 650acc3..eef2b16 100644 --- a/91-drm-modeset.rules +++ b/91-drm-modeset.rules @@ -1 +1 @@ -KERNEL=="controlD[0-9]*", NAME="dri/%k", MODE="0600" +KERNEL=="controlD[0-9]*", SUBSYTEM=="drm", MODE="0600" diff --git a/libdrm.spec b/libdrm.spec index 7f6c282..fe604a6 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -3,7 +3,7 @@ Summary: Direct Rendering Manager runtime library Name: libdrm Version: 2.4.26 -Release: 2%{?dist} +Release: 3%{?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%{_sysconfdir}/udev/rules.d/ -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ +mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/ +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/lib/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 -%config %{_sysconfdir}/udev/rules.d/91-drm-modeset.rules +/lib/udev/rules.d/91-drm-modeset.rules %files -n drm-utils %defattr(-,root,root,-) @@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libkms.pc %changelog +* Tue Oct 25 2011 Adam Jackson 2.4.26-3 +- Fix udev rule matching and install location (#748205) + * Fri Oct 21 2011 Dave Airlie 2.4.26-2 - fix perms on control node in udev rule