rpms/vdr/F-10 vdr-halt.local.sh, 1.2, 1.3 vdr-udev.rules, 1.2, 1.3 vdr.spec, 1.31, 1.32

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/vdr/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17154

Modified Files:
	vdr-halt.local.sh vdr-udev.rules vdr.spec 
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.
- Drop remote plugin examples from udev rules, they're in vdr-remote now.



Index: vdr-halt.local.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-10/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:48:04 -0000	1.3
@@ -10,7 +10,7 @@
 # /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
@@ -19,9 +19,12 @@
     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
+    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


Index: vdr-udev.rules
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-10/vdr-udev.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-udev.rules	2 Jan 2007 20:53:18 -0000	1.2
+++ vdr-udev.rules	22 Nov 2008 20:48:04 -0000	1.3
@@ -1,4 +1,6 @@
-# VDR friendly udev rules for DVB and other devices
+# VDR friendly udev rules for DVB and other devices.
+
+# See also *-vdr-remote.rules if using the remote plugin.
 
 # See also /etc/security/console.perms.d/*-vdr.perms and
 # https://bugzilla.redhat.com/202132
@@ -8,17 +10,3 @@
 
 # Remote controller, serial port 1 (eg. vdr --rcu=/dev/ttyS0):
 #KERNEL=="ttyS0", GROUP="VDR_GROUP", MODE="0660"
-
-# Remote controller, /dev/input/event2 (using the remote plugin).  Change
-# event2 to event-remote if you're using the predictable naming rule below.
-#KERNEL=="event2", GROUP="VDR_GROUP", MODE="0660"
-
-# Example rule for predictable event device name (/dev/input/event-remote).
-# Adjust the sysfs name according to your setup, see
-# /sys/class/input/input*/name.  Examples:
-
-# Hauppauge Nexus-S, some other Hauppauge/Technotrend cards:
-#SUBSYSTEM=="input", SYSFS{../name}=="DVB on-card IR receiver", SYMLINK+="input/event-remote"
-
-# Some Hauppauge Nova-T cards:
-#SUBSYSTEM=="input", SYSFS{../name}=="cx88 IR (Hauppauge Nova-T DVB-T", SYMLINK+="input/event-remote"


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/F-10/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:48:04 -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.
+- Drop remote plugin examples from udev rules, they're in vdr-remote now.
+
 * 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.