rpms/vdr/devel vdr.spec,1.30,1.31 vdr-halt.local.sh,1.1,1.2

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11383

Modified Files:
	vdr.spec vdr-halt.local.sh 
Log Message:
* Tue Oct 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-7
- Fix setting wakeup time via /proc/acpi/alarm when hardware clock is UTC.



Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vdr.spec	25 Sep 2008 20:27:59 -0000	1.30
+++ vdr.spec	28 Oct 2008 18:51:27 -0000	1.31
@@ -21,7 +21,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -494,6 +494,9 @@
 %endif # plugins
 
 %changelog
+* Tue Oct 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-7
+- Fix setting wakeup time via /proc/acpi/alarm when hardware clock is UTC.
+
 * Thu Sep 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-6
 - README.package updates.
 - Specfile micro-cleanups.


Index: vdr-halt.local.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-halt.local.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-halt.local.sh	7 Sep 2008 15:18:36 -0000	1.1
+++ vdr-halt.local.sh	28 Oct 2008 18:51:27 -0000	1.2
@@ -5,7 +5,7 @@
 #
 # If /sbin/halt.local does not exist, something like the following shell
 # script should work.  Remember to make it executable.
-# 
+#
 # #!/bin/sh
 # /usr/lib/vdr/bin/vdr-halt.local.sh
 
@@ -15,15 +15,18 @@
 
 trap "rm -f $wakeupfile" EXIT
 
-if [ -s "$wakeupfile" ] ; then
-    seconds=$(cat "$wakeupfile")
-    datestr=$(date -d "1970-01-01 UTC $seconds sec" +"%Y-%m-%d %H:%M:%S")
-    if [ -w "$sysfsalarm" ] ; then
-        echo "Setting ACPI wakeup for next VDR timer (via sysfs): $datestr"
-        echo 0          > "$sysfsalarm"
-        echo "$seconds" > "$sysfsalarm"
-    elif [ -w "$procalarm" ] ; then
-        echo "Setting ACPI wakeup for next VDR timer (via /proc): $datestr"
-        echo "$datestr" > "$procalarm"
+if [ -s $wakeupfile ] ; then
+    secs=$(cat $wakeupfile)
+    datestr="1970-01-01 UTC $secs sec"
+    echo -n "Setting wakeup for next VDR timer: " ; date -d "$datestr"
+    if [ -w $sysfsalarm ] ; then
+        echo 0     > $sysfsalarm
+        echo $secs > $sysfsalarm
+    elif [ -w $procalarm ] ; then
+        grep -qsx UTC /etc/adjtime && utc=--utc || utc=
+        date $utc -d "$datestr" +"%F %T" > $procalarm
+    else
+        echo "Warning: no supported methods found, wakeup not set."
+        sleep 1
     fi
 fi