From 779a66dc93bfe3718cf72853c9b7d03a98f11b17 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Jan 23 2013 09:36:11 +0000
Subject: Fixed tmpfiles entry (see rhbz #894364)


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/mpdscribble.service b/mpdscribble.service
index 1839a7c..4ceffab 100644
--- a/mpdscribble.service
+++ b/mpdscribble.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Mpdscribble
 After=mpd.service network.target
-Requires=mpd.service 
+Requires=mpd.service
 
 [Service]
 Type=simple
diff --git a/mpdscribble.spec b/mpdscribble.spec
index d993d8b..57c186b 100644
--- a/mpdscribble.spec
+++ b/mpdscribble.spec
@@ -9,7 +9,7 @@
 
 Name:           mpdscribble
 Version:        0.22
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A mpd client which submits information about tracks being played to Last.fm
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -24,9 +24,9 @@ BuildRequires:  libmpdclient-devel >= 2.2
 %if 0%{?fedora} > 17
 # Users and groups
 Requires(pre): shadow-utils
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 %else
 Requires(post): chkconfig
 Requires(preun):chkconfig
@@ -75,10 +75,7 @@ useradd -r -g %{name} -d %{_localstatedir}/cache/%{name} -s /sbin/nologin \
 
 %post
 %if 0%{?fedora} > 17
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post %{name}.service
 %else
 /sbin/chkconfig --add %{name}
 %endif
@@ -86,11 +83,7 @@ fi
 
 %preun
 %if 0%{?fedora} > 17
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
-    /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
-fi
+%systemd_preun %{name}.service
 %else
 if [ $1 = 0 ]; then
  /sbin/service %{name} stop > /dev/null 2>&1
@@ -132,6 +125,9 @@ chown -R %{mpdscribble_user}:%{mpdscribble_group} %{_sysconfdir}/%{name}.conf
 
 
 %changelog
+* Wed Jan 23 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.22-3
+- Fixed tmpfiles entry (see rhbz #894364)
+
 * Sun Sep 16 2012 Peter Lemenkov <lemenkov@gmail.com> - 0.22-2
 - Fix building
 
diff --git a/mpdscribble.tmpfiles.conf b/mpdscribble.tmpfiles.conf
index dc28c2a..59d7e44 100644
--- a/mpdscribble.tmpfiles.conf
+++ b/mpdscribble.tmpfiles.conf
@@ -1 +1 @@
-d /var/cache/mpdscribble 0755 mpdscribble mpdscribble
+d /var/run/mpdscribble 0755 mpdscribble mpdscribble