diff --git a/alsa-restore.service b/alsa-restore.service index 4e9466b..0411c99 100644 --- a/alsa-restore.service +++ b/alsa-restore.service @@ -4,14 +4,13 @@ # [Unit] -Description=Restore Sound Card State +Description=Save/Restore Sound Card State ConditionPathExists=!/etc/alsa/state-daemon.conf -DefaultDependencies=no After=alsa-state.service -Before=shutdown.target -Conflicts=shutdown.target [Service] Type=oneshot +RemainAfterExit=true ExecStart=-/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf --initfile=/lib/alsa/init/00main restore +ExecStop=/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf store StandardOutput=syslog diff --git a/alsa-state.service b/alsa-state.service index 9b906de..f917da8 100644 --- a/alsa-state.service +++ b/alsa-state.service @@ -6,10 +6,7 @@ [Unit] Description=Manage Sound Card State (restore and store) ConditionPathExists=/etc/alsa/state-daemon.conf -DefaultDependencies=no After=sysinit.target -Before=shutdown.target -Conflicts=shutdown.target [Service] Type=simple diff --git a/alsa-store.service b/alsa-store.service deleted file mode 100644 index 87a6cb1..0000000 --- a/alsa-store.service +++ /dev/null @@ -1,15 +0,0 @@ -# -# Note that two different ALSA card state management schemes exist and they -# can be switched using a file exist check - /etc/alsa/state-daemon.conf . -# - -[Unit] -Description=Store Sound Card State -ConditionPathExists=!/etc/alsa/state-daemon.conf -DefaultDependencies=no -Before=shutdown.target - -[Service] -Type=oneshot -ExecStart=/sbin/alsactl -E ALSA_CONFIG_PATH=/etc/alsa/alsactl.conf store -StandardOutput=syslog diff --git a/alsa-utils.spec b/alsa-utils.spec index 03a5927..48e74f0 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,11 +1,11 @@ -%define baseversion 1.0.29 -#define fixversion .2 -%global _hardened_build 1 +%define baseversion 1.1.1 +#define fixversion .2 +%global _hardened_build 1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -15,7 +15,6 @@ Source5: alsaunmute.1 Source10: alsa.rules Source11: alsactl.conf Source20: alsa-restore.service -Source21: alsa-store.service Source22: alsa-state.service BuildRequires: alsa-lib-devel >= %{baseversion} @@ -34,6 +33,15 @@ Requires: alsa-lib%{?_isa} >= %{baseversion} This package contains command line utilities for the Advanced Linux Sound Architecture (ALSA). +%package alsabat +Summary: Advanced Linux Sound Architecture (ALSA) - Basic Audio Tester +Group: Applications/Multimedia +BuildRequires: fftw-devel + +%description alsabat +This package contains tool for basic audio testing using Advanced Linux Sound +Architecture (ALSA) framework and Fast Fourier Transform library. + %prep %setup -q -n %{name}-%{version} @@ -45,21 +53,20 @@ make %{?_smp_mflags} cp %{SOURCE4} . %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} %find_lang %{name} # Install ALSA udev rules -mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d -install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT/%{_prefix}/lib/udev/rules.d/90-alsa-restore.rules -mkdir -p $RPM_BUILD_ROOT/%{_unitdir} -install -p -m 644 %{SOURCE20} $RPM_BUILD_ROOT/%{_unitdir}/alsa-restore.service -install -p -m 644 %{SOURCE21} $RPM_BUILD_ROOT/%{_unitdir}/alsa-store.service -install -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_unitdir}/alsa-state.service +mkdir -p %{buildroot}/%{_prefix}/lib/udev/rules.d +install -p -m 644 %{SOURCE10} %{buildroot}/%{_prefix}/lib/udev/rules.d/90-alsa-restore.rules +mkdir -p %{buildroot}/%{_unitdir} +install -p -m 644 %{SOURCE20} %{buildroot}/%{_unitdir}/alsa-restore.service +install -p -m 644 %{SOURCE22} %{buildroot}/%{_unitdir}/alsa-state.service # Install support utilities -mkdir -p -m755 $RPM_BUILD_ROOT/%{_bindir} +mkdir -p -m755 %{buildroot}/%{_bindir} install -p -m 755 alsaunmute %{buildroot}/%{_bindir} -mkdir -p -m755 $RPM_BUILD_ROOT/%{_mandir}/man1 +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 @@ -82,23 +89,58 @@ mkdir -p -m 755 %{buildroot}/var/lib/alsa %{_prefix}/lib/udev/rules.d/* %{_unitdir}/* %{_unitdir}/basic.target.wants/* -%{_unitdir}/shutdown.target.wants/* %{_prefix}/lib/alsa/init/* -%{_bindir}/* +%{_bindir}/aconnect +%{_bindir}/alsaloop +%{_bindir}/alsamixer +%{_bindir}/alsaucm +%{_bindir}/alsaunmute +%{_bindir}/amidi +%{_bindir}/amixer +%{_bindir}/aplay +%{_bindir}/aplaymidi +%{_bindir}/arecord +%{_bindir}/arecordmidi +%{_bindir}/aseqdump +%{_bindir}/aseqnet +%{_bindir}/iecset +%{_bindir}/speaker-test +%{_bindir}/alsatplg %{_sbindir}/* %{_datadir}/alsa/ %{_datadir}/sounds/* -%{_mandir}/man?/* +%{_mandir}/man7/* +%{_mandir}/man1/alsactl.1.gz +%{_mandir}/man1/alsaloop.1.gz +%{_mandir}/man1/alsamixer.1.gz +%{_mandir}/man1/alsaunmute.1.gz +%{_mandir}/man1/amidi.1.gz +%{_mandir}/man1/amixer.1.gz +%{_mandir}/man1/aplay.1.gz +%{_mandir}/man1/aplaymidi.1.gz +%{_mandir}/man1/arecord.1.gz +%{_mandir}/man1/arecordmidi.1.gz +%{_mandir}/man1/aseqdump.1.gz +%{_mandir}/man1/aseqnet.1.gz +%{_mandir}/man1/iecset.1.gz +%{_mandir}/man1/speaker-test.1.gz +%{_mandir}/man1/aconnect.1.gz +%{_mandir}/man1/alsa-info.sh.1.gz + %dir /etc/alsa/ %dir %{_prefix}/lib/alsa/ %dir %{_prefix}/lib/alsa/init/ %dir /var/lib/alsa/ +%files alsabat +%{_bindir}/alsabat +%{_mandir}/man1/alsabat.1.gz + %pre -if [ ! -r /lib/systemd/system/alsa-state.service ]; then +if [ ! -r %{_unitdir}/alsa-state.service ]; then [ -d /etc/alsa ] || mkdir -m 0755 /etc/alsa echo "# Remove this file to disable the alsactl daemon mode" > \ - /etc/alsa/state-daemon.conf + /etc/alsa/state-daemon.conf fi %post @@ -117,11 +159,20 @@ fi %systemd_postun_with_restart alsa-state.service %changelog +* Thu Mar 31 2016 Jaroslav Kysela - 1.1.1-1 +- Updated to 1.1.1 +- Renamed bat to alsabat (according 1.1.1) + +* Tue Oct 27 2015 Jaroslav Kysela - 1.1.0-1 +- Updated to 1.1.0 +- update systemd unit configuration files +- create alsa-utils-bat package + * Tue Jun 16 2015 Fedora Release Engineering - 1.0.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild * Thu Feb 26 2015 Jaroslav Kysela - 1.0.29-1 -* Updated to 1.0.29 +- Updated to 1.0.29 * Fri Aug 15 2014 Fedora Release Engineering - 1.0.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -256,7 +307,7 @@ fi - updated alsa-info.sh to 0.4.54 * Wed Feb 04 2009 Jaroslav Kysela 1.0.19-2 -- add %dir directive for /lib/alsa and /lib/alsa/init directories (bz#483324) +- add dir directive for /lib/alsa and /lib/alsa/init directories (bz#483324) * Tue Jan 20 2009 Jaroslav Kysela 1.0.19-1 - updated to 1.0.19 final @@ -273,7 +324,7 @@ fi * Thu Sep 18 2008 Jaroslav Kysela 1.0.18-2.rc3 - fixed /lib/alsa/init path for x86_64 (was /lib64/alsa/init) -- added /etc/alsa/asound.state -> /etc/asound.state shift to %post section +- added /etc/alsa/asound.state -> /etc/asound.state shift to post section - fix udev rules (ommited /dev/ prefix for the alsactl utility) - added --ignore option for alsactl (added also to upstream) @@ -343,7 +394,7 @@ fi - added more funcionality to salsa (save/load sound settings), moved volume settings to /etc/alsa/ -* Thu Apr 10 2007 Martin Stransky 1.0.14-0.4.rc2 +* Tue Apr 10 2007 Martin Stransky 1.0.14-0.4.rc2 - added support for large files - minor fix in alsaunmute - fixed #209239 - alsaconf: Stale language-dependent files diff --git a/sources b/sources index 74987ac..7a93f46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b289bf874c4c9a63f4b3973093dd404 alsa-utils-1.0.29.tar.bz2 +f8d00ad5fba757b4c3735d066cc288e2 alsa-utils-1.1.1.tar.bz2