diff --git a/alsa-utils.spec b/alsa-utils.spec index ff5511d..90062d2 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -12,13 +12,14 @@ Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version_tar}%{?prever 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 @@ make install DESTDIR=$RPM_BUILD_ROOT 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 @@ install -m 755 alsaunmute %{buildroot}%{_bindir} %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 @@ install -m 755 alsaunmute %{buildroot}%{_bindir} /usr/share/alsa/speaker-test/* %changelog -* Thu Jul 11 2005 Martin Stransky 1.0.9-3 +* Wed Jul 13 2005 Bill Nottingham 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 1.0.9-3 - New alsaunmute utility - Add autoconf to BuildRequires (#162483) diff --git a/alsa.rules b/alsa.rules new file mode 100644 index 0000000..78a45df --- /dev/null +++ b/alsa.rules @@ -0,0 +1,2 @@ +SUBSYSTEM=="sound", KERNEL=="controlC*" RUN+="/sbin/salsa" +SUBSYSTEM=="sound", KERNEL=="pcm*" RUN+="/sbin/salsa" \ No newline at end of file