rpms/alsa-utils/devel alsa.rules, NONE, 1.1 alsa-utils.spec, 1.19, 1.20

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/alsa-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21862

Modified Files:
	alsa-utils.spec 
Added Files:
	alsa.rules 
Log Message:
- migrate the alsa restore program to a udev rule, not a dev.d program
- conflict with appropriate udev



--- NEW FILE alsa.rules ---
SUBSYSTEM=="sound", KERNEL=="controlC*"	RUN+="/sbin/salsa"
SUBSYSTEM=="sound", KERNEL=="pcm*"	RUN+="/sbin/salsa"		

Index: alsa-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- alsa-utils.spec	11 Jul 2005 13:11:40 -0000	1.19
+++ alsa-utils.spec	13 Jul 2005 19:03:02 -0000	1.20
@@ -12,13 +12,14 @@
 Source2:	salsa.c
 Source3: 	alsacard.c
 Source4: 	alsaunmute.c
+Source10:	alsa.rules
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
 BuildRequires:	gettext-devel
+Conflicts:	udev < 062
 BuildRequires:	autoconf
 
-
 %description
 This package contains command line utilities for the Advanced Linux Sound
 Architecture (ALSA).
@@ -44,8 +45,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
 ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
-mkdir -p -m755 $RPM_BUILD_ROOT/etc/dev.d/sound
-install -m 755 salsa $RPM_BUILD_ROOT/etc/dev.d/sound/alsa.dev
+install -m 755 salsa $RPM_BUILD_ROOT/sbin
+mkdir -p -m755 $RPM_BUILD_ROOT/etc/udev/rules.d/
+install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d
 install -m 755 alsacard  %{buildroot}%{_bindir}
 install -m 755 alsaunmute  %{buildroot}%{_bindir}
 
@@ -55,8 +57,7 @@
 %files -f alsaconf.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README TODO
-%dir /etc/dev.d/sound
-/etc/dev.d/sound/*
+/etc/udev/rules.d/*
 %{_bindir}/*
 %{_sbindir}/*
 /sbin/*
@@ -66,7 +67,11 @@
 /usr/share/alsa/speaker-test/*
 
 %changelog
-* Thu Jul 11 2005 Martin Stransky <stransky at redhat.com> 1.0.9-3
+* Wed Jul 13 2005 Bill Nottingham <notting at redhat.com> 1.0.9-4
+- migrate the alsa restore program to a udev rule, not a dev.d program
+- conflict with appropriate udev
+
+* Mon Jul 11 2005 Martin Stransky <stransky at redhat.com> 1.0.9-3
 - New alsaunmute utility
 - Add autoconf to BuildRequires (#162483)