[inn] Timer service units have to been enabled also

[Jochen Schmitt]

commit 319c1fa3cc4320b6f91f3bdaf0a1135140c5dd44
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Fri Jan 25 22:28:18 2013 +0100

    Timer service units have to been enabled also

 inn.spec              |   20 ++++++++++++++++----
 innd-nntpsend.service |    3 ++-
 innd-nntpsend.timer   |    2 ++
 innd-rnews.service    |    2 +-
 innd-rnews.timer      |    2 ++
 5 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/inn.spec b/inn.spec
index e8abe9f..745a9cb 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.5.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -227,6 +227,9 @@ touch /var/log/news/news.err
 chown -R news:news /var/log/news*
 
 %systemd_post innd.service
+systemctl enable innd-expire.service >/dev/null
+systemctl enable innd-nntpsend.service >/dev/null
+systemctl enable innd-rnews.service >/dev/null
 
 systemctl enable innd-expire.timer >/dev/null
 systemctl enable innd-nntpsend.timer >/dev/null
@@ -236,6 +239,10 @@ systemctl start innd-expire.timer
 systemctl start innd-nntpsend.timer
 systemctl start innd-rnews.timer
 
+systemctl start innd-expire.service
+systemctl start innd-nntpsend.service
+systemctl start innd-rnews.service
+
 %post libs -p /sbin/ldconfig
 
 %triggerin -- rsyslog
@@ -290,6 +297,11 @@ fi
 %systemd_preun innd-expire.timer
 %systemd_preun innd-nntpsend.timer
 %systemd_preun innd-rnews.timer
+
+%systemd_preun innd-expire.service
+%systemd_preun innd-nntpsend.service
+%systemd_preun innd-rnews.service
+
 %systemd_preun innd.service
 
 if [ $1 = 0 ]; then
@@ -300,9 +312,6 @@ fi
 
 %postun
 %systemd_postun_with_restart innd.service
-%systemd_postun_with_restart innd-expire.service
-%systemd_postun_with_restart innd-nntpsend.serivce
-%systemd_postun_with_restart innd-rnews.service
 
 %postun libs -p /sbin/ldconfig
 
@@ -548,6 +557,9 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Fri Jan 25 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-8
+- Timer service units have to been enabled also
+
 * Wed Jan 23 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-7
 - Using of %%{_tmpfilesdir} instaead of %%{_sysconfdir}/tmpfiles.d/
 - Disable SMP build due an SMP-related issue
diff --git a/innd-nntpsend.service b/innd-nntpsend.service
index 0b8973f..3e23549 100644
--- a/innd-nntpsend.service
+++ b/innd-nntpsend.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Inetnet News Daemon Sending News
-After=syslog.target network.target innd.service
+After=innd.service
 ConditionPathExists=/etc/news/inn.conf
+conditionPathExists=/run/news/inn.pid
 
 [Service]
 User=news
diff --git a/innd-nntpsend.timer b/innd-nntpsend.timer
index 3f8c746..f6c6b15 100644
--- a/innd-nntpsend.timer
+++ b/innd-nntpsend.timer
@@ -1,5 +1,7 @@
 [Unit]
 Description=Inetnet News Daemon NNTP Send
+After=innd.service
+ConditionPathExists=/etc/news/inn.conf
 
 [Timer]
 OnUnitActiveSec=1h
diff --git a/innd-rnews.service b/innd-rnews.service
index 4889337..fd7051b 100644
--- a/innd-rnews.service
+++ b/innd-rnews.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Inetnet News Daemon Receiving News
-After=syslog.target network.target innd.service
+After=innd.service
 ConditionPathExists=/etc/news/inn.conf
 
 [Service]
diff --git a/innd-rnews.timer b/innd-rnews.timer
index 72a7fe7..e44f0a1 100644
--- a/innd-rnews.timer
+++ b/innd-rnews.timer
@@ -1,5 +1,7 @@
 [Unit]
 Description=Inetnet News Daemon Receiving News
+After=innd.service
+ConditionPathExists=/etc/news/inn.conf
 
 [Timer]
 OnUnitActiveSec=1h