systemd related fixes

This commit is contained in:
Jaroslav Kysela 2011-01-28 13:56:10 +01:00
parent bb774c2535
commit 47deeafb02

View File

@ -4,7 +4,7 @@
Summary: Advanced Linux Sound Architecture (ALSA) utilities
Name: alsa-utils
Version: %{baseversion}%{?fixversion}
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.alsa-project.org/
@ -14,6 +14,8 @@ Source5: alsaunmute.1
Source6: alsa-info.sh
Source10: alsa.rules
Source11: alsactl.conf
Source20: alsa-restore.service
Source21: alsa-store.service
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= %{baseversion}
BuildRequires: libsamplerate-devel
@ -21,7 +23,7 @@ BuildRequires: ncurses-devel
BuildRequires: gettext-devel
BuildRequires: xmlto
Conflicts: udev < 062
Requires: alsa-lib >= %{baseversion}, dialog
Requires: alsa-lib >= %{baseversion}, systemd-units, dialog
%description
This package contains command line utilities for the Advanced Linux Sound
@ -41,8 +43,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
# Install ALSA udev rules
mkdir -p -m 755 $RPM_BUILD_ROOT/etc/udev/rules.d
install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules
install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT/lib/udev/rules.d/90-alsa-restore.rules
install -p -m 644 %(SOURCE20} $RPM_BUILD_ROOT/lib/systemd/system/basic.target.wants/alsa-restore.service
install -p -m 644 %(SOURCE21} $RPM_BUILD_ROOT/lib/systemd/system/shutdown.target.wants/alsa-store.service
# Install support utilities
mkdir -p -m755 $RPM_BUILD_ROOT/bin
@ -66,6 +69,9 @@ mkdir -p -m 755 %{buildroot}/etc/alsa
install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa
touch %{buildroot}/etc/asound.state
# Create /var/lib/alsa tree
mkdir -p -m 755 %{buildroot}/var/lib/alsa
# Install alsa-info.sh script
install -p -m 755 %{SOURCE6} %{buildroot}/usr/bin/alsa-info
ln -s alsa-info %{buildroot}/usr/bin/alsa-info.sh
@ -76,10 +82,13 @@ ln -s alsa-info %{buildroot}/usr/bin/alsa-info.sh
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING ChangeLog README TODO
%config /etc/udev/rules.d/*
%config /etc/alsa/*
/bin/*
/sbin/*
/lib/udev/rules.d/*
/lib/systemd/system/*
/lib/systemd/system/basic.target.wants/*
/lib/systemd/system/shutdown.target.wants/*
/lib/alsa/init/*
%{_bindir}/*
%{_sbindir}/*
@ -89,14 +98,23 @@ ln -s alsa-info %{buildroot}/usr/bin/alsa-info.sh
%dir /etc/alsa/
%dir /lib/alsa/
%dir /lib/alsa/init/
%dir /var/lib/alsa/
%ghost /etc/asound.state
%post
if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then
mv /etc/alsa/asound.state /etc/asound.state
fi
if [ -s /etc/asound.state -a ! -s /var/lib/alsa/asound.state ] ; then
mv /etc/asound.state /var/lib/alsa/asound.state
fi
%changelog
* Fri Jan 28 2011 Jaroslav Kysela <jkysela@redhat.com> 1.0.24.1-2
- add missing systemd files, add dependency on systemd-units
- use own udev rule file for /lib/udev/rules.d
- create /var/lib/alsa directory for asound.state
* Fri Jan 28 2011 Jaroslav Kysela <jkysela@redhat.com> 1.0.24.1-1
- updated to 1.0.24.1 final (new automake/autoconf)