[inn] Fix some issues with the systemd timer units

[Jochen Schmitt]

commit bc6db652de7a26d64e5be01bb8d8c98baae7bebc
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue Jan 22 11:12:01 2013 +0100

    Fix some issues with the systemd timer units

 inn.spec            |    5 ++++-
 innd-expire.timer   |    8 +-------
 innd-nntpsend.timer |    8 +-------
 innd-rnews.timer    |    8 +-------
 4 files changed, 7 insertions(+), 22 deletions(-)
---
diff --git a/inn.spec b/inn.spec
index 75dd4b2..924e223 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: 5%{?dist}
+Release: 6%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 Group: System Environment/Daemons
@@ -542,6 +542,9 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Jan 22 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-6
+- Fix some issues with the systemd timer units
+
 * Wed Jan 16 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-5
 - Migrating from cron to systemd timer
 - Change %%doc %%dir into %%doc
diff --git a/innd-expire.service b/innd-expire.service
old mode 100644
new mode 100755
diff --git a/innd-expire.timer b/innd-expire.timer
index f04aabb..dbac016 100644
--- a/innd-expire.timer
+++ b/innd-expire.timer
@@ -1,11 +1,5 @@
 [Unit]
 Description=Inetnet News Daemon Exp
-After=syslog.target network.target innd.service
-ConditionPathExists=/etc/news/inn.conf
 
 [Timer]
-OnUnitActSec=1d
-Unit=innd-expire.service
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+OnUnitActiveSec=1d
diff --git a/innd-nntpsend.timer b/innd-nntpsend.timer
index ba6f686..ab6f064 100644
--- a/innd-nntpsend.timer
+++ b/innd-nntpsend.timer
@@ -1,11 +1,5 @@
 [Unit]
 Description=Inetnet News Daemon NNTP Send
-After=syslog.target network.target innd.service
-ConditionPathExists=/etc/news/inn.conf
 
 [Timer]
-OnUnitActSec=1h
-Unit=innd-nntp.service
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+OnUnitActiveSec=1h
diff --git a/innd-rnews.timer b/innd-rnews.timer
index 7aff983..1fdac21 100644
--- a/innd-rnews.timer
+++ b/innd-rnews.timer
@@ -1,11 +1,5 @@
 [Unit]
 Description=Inetnet News Daemon Receiving News
-After=syslog.target network.target innd.service
-ConditionPathExists=/etc/news/inn.conf
 
 [Timer]
-OnUnitActSec=1h
-Unit=innd-rnews.service
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
+OnUnitActiveSec=1h