From fa7e0618201bed1811d488698c8c22358c51f437 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 16 Oct 2018 17:44:01 +0200 Subject: [PATCH] eliminate some lint errors --- alsa-utils.spec | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/alsa-utils.spec b/alsa-utils.spec index 02caca2..6d2fb2e 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -75,6 +75,8 @@ make %{?_smp_mflags} cp %{SOURCE4} . %install +%global alsacfgdir %{_prefix}/lib/alsa + make install DESTDIR=%{buildroot} %find_lang %{name} @@ -94,18 +96,18 @@ mkdir -p -m755 %{buildroot}/%{_mandir}/man1 install -p -m 644 %{SOURCE5} %{buildroot}/%{_mandir}/man1/alsaunmute.1 # Move /usr/share/alsa/init to /usr/lib/alsa/init -mkdir -p -m 755 %{buildroot}/%{_prefix}/lib/alsa -mv %{buildroot}%{_datadir}/alsa/init %{buildroot}/%{_prefix}/lib/alsa +mkdir -p -m 755 %{buildroot}%{alsacfgdir} +mv %{buildroot}%{_datadir}/alsa/init %{buildroot}%{alsacfgdir} # Link /usr/lib/alsa/init to /usr/share/alsa/init back -ln -s ../../lib/alsa/init %{buildroot}%{_datadir}/alsa/init +ln -s ../../lib/alsa/init %{buildroot}%{alsacfgdir} # Create a place for global configuration mkdir -p -m 755 %{buildroot}/etc/alsa install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa # Create /var/lib/alsa tree -mkdir -p -m 755 %{buildroot}/var/lib/alsa +mkdir -p -m 755 %{buildroot}%{_sharedstatedir}/alsa %files -f %{name}.lang %doc COPYING ChangeLog README TODO @@ -114,7 +116,7 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %exclude %{_prefix}/lib/udev/rules.d/*alsa-ucm* %{_unitdir}/* %{_unitdir}/sound.target.wants/* -%{_prefix}/lib/alsa/init/* +%{alsacfgdir}/init/* %{_bindir}/aconnect %{_bindir}/alsaloop %{_bindir}/alsamixer @@ -153,9 +155,9 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %{_mandir}/man1/alsa-info.sh.1.gz %dir /etc/alsa/ -%dir %{_prefix}/lib/alsa/ -%dir %{_prefix}/lib/alsa/init/ -%dir /var/lib/alsa/ +%dir %{alsacfgdir}/ +%dir %{alsacfgdir}/init/ +%dir %{_sharedstatedir}/alsa/ %files -n alsa-ucm-utils %{_prefix}/lib/udev/rules.d/*alsa-ucm* @@ -182,8 +184,8 @@ fi 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 +if [ -s /etc/asound.state -a ! -s %{_sharedstatedir}/alsa/asound.state ] ; then + mv /etc/asound.state %{_sharedstatedir}/alsa/asound.state fi %systemd_post alsa-state.service