rpms/vdr/devel vdr-halt.local.sh, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 vdr-README.package, 1.5, 1.6 vdr-shutdown.sh, 1.4, 1.5 vdr.spec, 1.27, 1.28 MainMenuHooks-v1_0.patch, 1.2, NONE timercmd-0.1_1.6.0.diff, 1.1, NONE vdr-1.6.0-1.diff, 1.1, NONE vdr-timer-info-0.5-1.5.15.diff, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Sun Sep 7 15:19:07 UTC 2008
Author: scop
Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27618
Modified Files:
.cvsignore sources vdr-README.package vdr-shutdown.sh vdr.spec
Added Files:
vdr-halt.local.sh
Removed Files:
MainMenuHooks-v1_0.patch timercmd-0.1_1.6.0.diff
vdr-1.6.0-1.diff vdr-timer-info-0.5-1.5.15.diff
Log Message:
* Sun Sep 7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-4
- Apply upstream 1.6.0-2 maintenance patch.
- Update shutdown/wakeup functionality for F-9+ ACPI wakeup.
- Install halt.local script (vdr-halt.local.sh) instead of embedding it
in README-package. It still needs to be inserted to (or installed/symlinked
as) /sbin/halt.local.
- Convert remaining docs to UTF-8.
- Set expected fuzz factor when applying patches.
Non-%changelog: Move some unmodified upstream patches to lookaside cache.
--- NEW FILE vdr-halt.local.sh ---
#!/bin/bash
# Modify /sbin/halt.local to call this script. For more information,
# see /usr/share/doc/vdr*/README.package
#
# 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
wakeupfile=/var/lib/vdr/next-wakeup
sysfsalarm=/sys/class/rtc/rtc0/wakealarm
procalarm=/proc/acpi/alarm
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"
fi
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 10 May 2008 16:19:36 -0000 1.15
+++ .cvsignore 7 Sep 2008 15:18:36 -0000 1.16
@@ -2,3 +2,8 @@
vdr-1.6.0.tar.bz2
vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
vdr-1.6.0-liemikuutio-1.21.diff.gz
+MainMenuHooks-v1_0.patch
+timercmd-0.1_1.6.0.diff
+vdr-1.6.0-1.diff
+vdr-1.6.0-2.diff
+vdr-timer-info-0.5-1.5.15.diff
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 10 May 2008 16:19:36 -0000 1.15
+++ sources 7 Sep 2008 15:18:36 -0000 1.16
@@ -2,3 +2,8 @@
76f4ebe6525a35e33313d27a3f8e80c0 vdr-1.6.0.tar.bz2
2e994fcf18766fed279e2a8f2a70e717 vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
f254c57830efc0f19c06c11f302c1195 vdr-1.6.0-liemikuutio-1.21.diff.gz
+f48d3f58168f89240f08162e366ac2d3 MainMenuHooks-v1_0.patch
+e9b82b88c1fa21b6fa9734ca240f6192 timercmd-0.1_1.6.0.diff
+4a6be2d47afa3a275837f1703c4df77b vdr-1.6.0-1.diff
+875b66a90d1c6f2e25aa1221b319136b vdr-1.6.0-2.diff
+92ee6cdf60b795d9fbcf4fdcafe401b4 vdr-timer-info-0.5-1.5.15.diff
Index: vdr-README.package
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-README.package,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vdr-README.package 17 Mar 2008 20:11:41 -0000 1.5
+++ vdr-README.package 7 Sep 2008 15:18:36 -0000 1.6
@@ -75,20 +75,13 @@
to the vdr user so it can carry out these tasks.
To use the ACPI alarm feature present in many recent systems, adding a
-script like this to /sbin/halt.local (remember to make it executable!)
-will cause the system to wake up at the time set by the above
-vdr-shutdown.sh, allowing one to shut down the system without having
-to manually start it for the next timed recording. /sbin/halt.local,
-if it exists, is automatically executed by the system shutdown/reboot
-scripts at appropriate time.
-
- #!/bin/bash
- wakeupfile=/var/lib/vdr/acpi-wakeup
- trap "rm -f $wakeupfile" EXIT
- if [ -s $wakeupfile -a -w /proc/acpi/alarm ] ; then
- echo -n "Setting ACPI wakeup for next VDR timer: " ; cat $wakeupfile
- cat $wakeupfile > /proc/acpi/alarm
- fi
+script like the supplied halt.local (see same directory as this file)
+to /sbin/halt.local (remember to make it executable!) will cause the
+system to wake up at the time set by the above vdr-shutdown.sh,
+allowing one to shut down the system without having to manually start
+it for the next timed recording. /sbin/halt.local, if it exists, is
+automatically executed by the system shutdown/reboot scripts at
+appropriate time.
Organizing recordings
---------------------
Index: vdr-shutdown.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-shutdown.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vdr-shutdown.sh 7 Apr 2008 19:31:02 -0000 1.4
+++ vdr-shutdown.sh 7 Sep 2008 15:18:36 -0000 1.5
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# To enable this script, pass it to vdr with the -s option, eg.
# "-s vdr-shutdown.sh" (sans quotes) in VDR_OPTIONS in /etc/sysconfig/vdr.
@@ -13,11 +13,11 @@
mins=${WAKEUP_BEFORE_RECORDING:-10}
-file=/var/lib/vdr/acpi-wakeup
-rm -f $file
+wakeupfile=/var/lib/vdr/next-wakeup
+rm -f $wakeupfile
-if [ ${1:-0} -gt 0 -a -e /proc/acpi/alarm ] ; then
- date -d "1970-01-01 UTC $1 sec -$mins min" +"%Y-%m-%d %H:%M:%S" > $file
+if [ ${1:-0} -gt 0 ] ; then
+ echo $(( $1 - $mins * 60 )) > $wakeupfile
fi
# In order to make this work, the vdr user needs to be allowed to run
Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vdr.spec 10 May 2008 16:19:36 -0000 1.27
+++ vdr.spec 7 Sep 2008 15:18:36 -0000 1.28
@@ -21,7 +21,7 @@
Name: vdr
Version: 1.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Video Disk Recorder
Group: Applications/Multimedia
@@ -38,7 +38,6 @@
# TODO
Source8: %{name}.consoleperms
Source9: %{name}-config.sh
-# TODO
Source10: %{name}-README.package
Source11: %{name}-skincurses.conf
Source12: %{name}-sky.conf
@@ -46,6 +45,7 @@
Source14: %{name}-shutdown.sh
Source15: %{name}-moveto.sh
Source16: %{name}-CHANGES.package.old
+Source17: %{name}-halt.local.sh
# TODO
Patch0: %{name}-channel+epg.patch
# TODO
@@ -58,7 +58,7 @@
Patch6: %{name}-1.5.18-syncearly.patch
Patch7: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ttxtsubs-0.0.5.diff.gz
Patch8: %{name}-1.6.0-man-section.patch
-# Patch8: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.0.diff
+# Patch9: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.0.diff
# edited so that it applies on top of the liemikuutio patch (menu.c)
Patch9: %{name}-1.5.18-hlcutter-0.2.0.diff
# TODO
@@ -73,6 +73,7 @@
Patch16: %{name}-1.6.0-dxr3-subtitles.patch
Patch17: http://toms-cafe.de/vdr/download/vdr-timer-info-0.5-1.5.15.diff
Patch18: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-1.diff
+Patch19: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.6.0-2.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -149,18 +150,18 @@
#patch0 -p1
%patch1 -p1
# TODO: does not apply
-#patch -i debian/patches/02_plugin_missing.dpatch
+#patch -F 0 -i debian/patches/02_plugin_missing.dpatch
# sort_options would be nice, but it conflicts with channel+epg which is nicer
-#patch -i debian/patches/02_sort_options.dpatch
-patch -i debian/patches/06_recording_scan_speedup.dpatch
-patch -i debian/patches/07_blockify_define.dpatch
-patch -i debian/patches/10_livelock.dpatch
-patch -i debian/patches/11_atsc.dpatch
+#patch -F 0 -i debian/patches/02_sort_options.dpatch
+patch -F 0 -i debian/patches/06_recording_scan_speedup.dpatch
+patch -F 2 -i debian/patches/07_blockify_define.dpatch
+patch -F 0 -i debian/patches/10_livelock.dpatch
+patch -F 0 -i debian/patches/11_atsc.dpatch
echo "DEFINES += -DHAVE_ATSC" >> Makefile
-patch -i debian/patches/19_debian_osdbase_maxitems.dpatch
-# TODO: does not apply, check upstream:
+patch -F 0 -i debian/patches/19_debian_osdbase_maxitems.dpatch
+# TODO: does not apply, check upstream for a 1.6.x version:
# http://www.ktverkko.fi/~msmakela/software/vdr/
-#patch -i debian/patches/opt-20_suspend.dpatch
+#patch -F 0 -i debian/patches/opt-20_suspend.dpatch
%patch2 -p1
%patch3 -p1
sed \
@@ -169,25 +170,26 @@
-e 's|__PLUGINDIR__|%{plugindir}|' \
-e 's|__VARDIR__|%{vardir}|' \
-e 's|__VIDEODIR__|%{videodir}|' \
- %{PATCH4} | patch -p1
+ %{PATCH4} | patch -p1 -F 1
%patch5 -p1
%patch6 -p0
%patch7 -p1
%patch8 -p1
-%patch9 -p0
+%patch9 -p0 -F 1
# TODO: does not apply
#patch10 -p0
-%patch11 -p1
+%patch11 -p1 -F 2
# timer-info patch needs to come before timercmd patch to avoid conflicts
%patch17 -p1
-%patch12 -p1
+%patch12 -p1 -F 2
%patch13 -p1
-%patch14 -p0
+%patch14 -p0 -F 2
%patch15 -p0
%patch16 -p0
%patch18 -p1
+%patch19 -p1
-for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 ; do
+for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do
iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
done
@@ -323,6 +325,10 @@
sed -e 's|/var/lib/vdr/|%{vardir}/|' < %{SOURCE14} \
> $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-shutdown.sh
+sed -e 's|/var/lib/vdr/|%{vardir}/|' \
+ -e 's|/usr/lib/vdr/bin/|%{plugindir}/bin/|' < %{SOURCE17} \
+ > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-halt.local.sh
+chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-halt.local.sh
sed -e 's|/srv/vdr|%{videodir}|' -e 's|/etc/vdr/|%{configdir}/|' \
< %{SOURCE15} > $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
chmod 755 $RPM_BUILD_ROOT%{plugindir}/bin/%{name}-moveto.sh
@@ -332,7 +338,7 @@
install -dm 755 $RPM_BUILD_ROOT%{datadir}/logos
install -dm 755 $RPM_BUILD_ROOT%{rundir}
install -dm 755 $RPM_BUILD_ROOT%{vardir}
-touch $RPM_BUILD_ROOT%{vardir}/acpi-wakeup
+touch $RPM_BUILD_ROOT%{vardir}/next-wakeup
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE4} \
@@ -427,6 +433,7 @@
%{_sbindir}/vdr
%dir %{plugindir}/
%dir %{plugindir}/bin/
+%{plugindir}/bin/%{name}-halt.local.sh
%{plugindir}/bin/%{name}-moveto.sh
%{plugindir}/bin/%{name}-shutdown.sh
%{datadir}/
@@ -437,7 +444,7 @@
%dir %{videodir}/
%ghost %{videodir}/.update
%dir %{audiodir}/
-%ghost %{vardir}/acpi-wakeup
+%ghost %{vardir}/next-wakeup
%ghost %{vardir}/themes/*.theme
%ghost %{cachedir}/epg.data
%defattr(-,%{vdr_user},root,-)
@@ -489,6 +496,15 @@
%endif # plugins
%changelog
+* Sun Sep 7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-4
+- Apply upstream 1.6.0-2 maintenance patch.
+- Update shutdown/wakeup functionality for F-9+ ACPI wakeup.
+- Install halt.local script (vdr-halt.local.sh) instead of embedding it
+ in README-package. It still needs to be inserted to (or installed/symlinked
+ as) /sbin/halt.local.
+- Convert remaining docs to UTF-8.
+- Set expected fuzz factor when applying patches.
+
* Sat May 10 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-3
- Update liemikuutio patch to 1.21.
- Change timercmd patch to the one shipped with epgsearch 0.9.24.
--- MainMenuHooks-v1_0.patch DELETED ---
--- timercmd-0.1_1.6.0.diff DELETED ---
--- vdr-1.6.0-1.diff DELETED ---
--- vdr-timer-info-0.5-1.5.15.diff DELETED ---
More information about the fedora-extras-commits
mailing list