rpms/vdr/devel vdr.spec,1.31,1.32 vdr-halt.local.sh,1.2,1.3

[Ville Skyttä]

Author: scop

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

Modified Files:
	vdr.spec vdr-halt.local.sh 
Log Message:
* Sat Nov 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-8
- Fix setting wakeup time via rtc0 when hardware clock is localtime.
- Do not try to set wakeup time if there are no pending recordings.



Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vdr.spec	28 Oct 2008 18:51:27 -0000	1.31
+++ vdr.spec	22 Nov 2008 20:14:55 -0000	1.32
@@ -21,7 +21,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -494,6 +494,10 @@
 %endif # plugins
 
 %changelog
+* Sat Nov 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-8
+- Fix setting wakeup time via rtc0 when hardware clock is localtime.
+- Do not try to set wakeup time if there are no pending recordings.
+
 * 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-halt.local.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-halt.local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-halt.local.sh	28 Oct 2008 18:51:27 -0000	1.2
+++ vdr-halt.local.sh	22 Nov 2008 20:14:56 -0000	1.3
@@ -10,23 +10,28 @@
 # /usr/lib/vdr/bin/vdr-halt.local.sh
 
 wakeupfile=/var/lib/vdr/next-wakeup
-sysfsalarm=/sys/class/rtc/rtc0/wakealarm
+rtcdir=/sys/class/rtc/rtc0
 procalarm=/proc/acpi/alarm
 
 trap "rm -f $wakeupfile" EXIT
 
 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
+    if [ "$secs" != "0" ] ; then
+        datestr="1970-01-01 UTC $secs sec"
+        echo -n "Setting wakeup for next VDR timer: " ; date -d "$datestr"
+        if [ -w $rtcdir/wakealarm ] ; then
+            offset=0
+            [ -r $rtcdir/since_epoch ] && \
+                offset=$(( $(cat $rtcdir/since_epoch) - $(date +%s) ))
+            echo 0                      > $rtcdir/wakealarm
+            echo $(( $secs + $offset )) > $rtcdir/wakealarm
+        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
 fi