[vdr] Tweak init script to behave better with systemd at shutdown.

[Ville Skyttä]

commit fe412b1fb9795fc7e8a62401ffa2c81d3b6e9afc
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Jul 7 23:05:20 2011 +0300

    Tweak init script to behave better with systemd at shutdown.

 vdr.init |    8 ++++----
 vdr.spec |    7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/vdr.init b/vdr.init
index 4311f95..0281c05 100644
--- a/vdr.init
+++ b/vdr.init
@@ -11,7 +11,7 @@
 
 ### BEGIN INIT INFO
 # Provides: vdr
-# Should-Start: $syslog $network lirc
+# Should-Start: $syslog $network lirc hwclock-save
 # Should-Stop: $syslog $network lirc
 # Short-Description: Video Disk Recorder
 # Description: Video Disk Recorder (VDR) implements a complete digital
@@ -62,12 +62,12 @@ start() {
 stop() {
     echo -n $"Stopping Video Disk Recorder ($prog): "
 
-    # Kill runvdr so it won't cause a restart in case of problems at shutdown.
-    killproc $runner >/dev/null
-
     # Set RTC wakeup for next timer event
     $runner --set-wakeup >/dev/null
 
+    # Kill runvdr so it won't cause a restart in case of problems at shutdown.
+    killproc $runner >/dev/null
+
     # Shutdown can be a bit slow sometimes with some plugins or lots of them,
     # so let's give it some time and a chance to go down gracefully.
     # TODO: make this configurable
diff --git a/vdr.spec b/vdr.spec
index 2f2ffb9..06f3d02 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -24,7 +24,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        39%{?dist}
+Release:        40%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -56,7 +56,7 @@ Patch4:         %{name}-1.6.0-paths.patch
 Patch5:         %{name}-1.5.18-use-pkgconfig.patch
 # http://article.gmane.org/gmane.linux.vdr/36097
 Patch6:         %{name}-1.5.18-syncearly.patch
-# http://projects.vdr-developer.org/repositories/entry/plg-ttxtsubs/patches/vdr-1.6.0-2-ttxtsubs.patch?format=raw
+# http://projects.vdr-developer.org/projects/plg-ttxtsubs/repository/raw/patches/vdr-1.6.0-2-ttxtsubs.patch?rev=release%2Fv0.1.0
 Patch7:         %{name}-1.6.0-2-ttxtsubs.patch
 Patch8:         %{name}-1.6.0-man-section.patch
 # http://www.udo-richter.de/vdr/patches.en.html#hlcutter
@@ -539,6 +539,9 @@ fi
 %endif # plugins
 
 %changelog
+* Thu Jul  7 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-40
+- Tweak init script to behave better with systemd at shutdown.
+
 * Fri Feb 18 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-39
 - Fix writing next wakeup time from shutdown script.