From be787e1607ff4c32da622ce3a16e1ab77ede1596 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Oct 27 2015 17:03:00 +0000
Subject: update systemd to follow upstream


---

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 fc36c5f..6853046 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -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}
@@ -62,7 +61,6 @@ 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 %{SOURCE21} %{buildroot}/%{_unitdir}/alsa-store.service
 install -p -m 644 %{SOURCE22} %{buildroot}/%{_unitdir}/alsa-state.service
 
 # Install support utilities
@@ -161,6 +159,7 @@ fi
 %changelog
 * Tue Oct 27 2015 Jaroslav Kysela <perex@perex.cz> - 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 <rel-eng@lists.fedoraproject.org> - 1.0.29-2