rpms/vdr/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 vdr-README.package, 1.2, 1.3 vdr-commands.conf, 1.1, 1.2 vdr.init, 1.2, 1.3 vdr.spec, 1.6, 1.7 vdr.sysconfig, 1.2, 1.3

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28699

Modified Files:
	.cvsignore sources vdr-README.package vdr-commands.conf 
	vdr.init vdr.spec vdr.sysconfig 
Log Message:
* Sun Jan 28 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-3
- Upstream 1.4.5-1, refresh other patches.
- Fix xineliboutput plugin name in sysconfig's VDR_PLUGIN_ORDER.
- Delay a bit in the init script's stop function for clean shutdown.
- Update CDDA_TRANSPORT workaround status in commands.conf abcde example.
- Improve /sbin/halt.local explanation in README.package.
- Minor specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Jan 2007 16:39:32 -0000	1.6
+++ .cvsignore	28 Jan 2007 11:11:18 -0000	1.7
@@ -1,3 +1,4 @@
-vdr-1.4.4-liemikuutio-1.13.diff.gz
-vdr_1.4.4-1.ds.diff.gz
 vdr-1.4.5.tar.bz2
+vdr_1.4.5-1.ds.diff.gz
+vdr-1.4.5-liemikuutio-1.13.diff.gz
+vdr-1.4.5-1.diff


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jan 2007 16:39:32 -0000	1.6
+++ sources	28 Jan 2007 11:11:18 -0000	1.7
@@ -1,3 +1,4 @@
-967281c1f666b24cbc3f46cd17dffe98  vdr-1.4.4-liemikuutio-1.13.diff.gz
-1b960579d3564eb7969812ed6a493777  vdr_1.4.4-1.ds.diff.gz
 db7e60927b673ca06d38a7669cab44c9  vdr-1.4.5.tar.bz2
+22e0c893539a8d480e80de4dd0368030  vdr_1.4.5-1.ds.diff.gz
+fa9f9128032a08a22a3051a4caf65462  vdr-1.4.5-liemikuutio-1.13.diff.gz
+01883b64ec3736cbab46f16aeba6ef58  vdr-1.4.5-1.diff


Index: vdr-README.package
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/vdr-README.package,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-README.package	17 Dec 2006 20:55:06 -0000	1.2
+++ vdr-README.package	28 Jan 2007 11:11:18 -0000	1.3
@@ -77,7 +77,9 @@
 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.
+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


Index: vdr-commands.conf
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/vdr-commands.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-commands.conf	16 Oct 2006 18:50:35 -0000	1.1
+++ vdr-commands.conf	28 Jan 2007 11:11:18 -0000	1.2
@@ -1,7 +1,8 @@
 # Main menu commands for VDR.  See the vdr(5) manual page.
 
 # To rip audio CD's with abcde, uncomment this.  See /etc/abcde.conf (or the
-# -o option) for output format and other settings, and CDDA_TRANSPORT at
-# https://bugzilla.redhat.com/166141
+# -o option) for output format and other settings, and try
+# "env CDDA_TRANSPORT=cooked abcde -Np" instead of just "abcde -Np" in case
+# you experience problems, see https://bugzilla.redhat.com/166141
 #
-#Rip audio CD?: cd /srv/audio ; env CDDA_TRANSPORT=cooked abcde -Np
+#Rip audio CD?: cd /srv/audio ; abcde -Np


Index: vdr.init
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/vdr.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr.init	17 Dec 2006 20:55:06 -0000	1.2
+++ vdr.init	28 Jan 2007 11:11:18 -0000	1.3
@@ -50,7 +50,9 @@
 
 stop() {
     echo -n $"Stopping Video Disk Recorder ($prog): "
-    killproc $prog
+    # 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.
+    killproc -d 7 $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile


Index: vdr.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr.spec	7 Jan 2007 16:39:32 -0000	1.6
+++ vdr.spec	28 Jan 2007 11:11:18 -0000	1.7
@@ -19,7 +19,7 @@
 
 Name:           vdr
 Version:        1.4.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -40,10 +40,11 @@
 Source13:       %{name}-timercmds.conf
 Source14:       %{name}-shutdown.sh
 Patch0:         %{name}-channel+epg.patch
-Patch1:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.4-1.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.4-liemikuutio-1.13.diff.gz
+Patch1:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.5-1.ds.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.5-liemikuutio-1.13.diff.gz
 Patch3:         %{name}-1.4.1-paths.patch
 Patch4:         %{name}-1.4.1-dumpable.patch
+Patch5:         ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.5-1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -124,13 +125,12 @@
 patch -i debian/patches/opt-20_epgsearch.dpatch
 #patch -i debian/patches/opt-20_liemikuutio.dpatch
 patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch
-sed -i -e 's/!cPluginManager::Active() && //' \
-    debian/patches/opt-20_suspend.dpatch # adapt for 1.4.5
 patch -i debian/patches/opt-20_suspend.dpatch
 patch -i debian/patches/opt-20_vdr-timer-info.dpatch
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Fix up paths
 sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c
@@ -308,11 +308,10 @@
 install -pm 755 newplugin $RPM_BUILD_ROOT%{_bindir}/vdr-newplugin
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/vdr/include/vdr
 install -pm 644 Make.config $RPM_BUILD_ROOT%{_libdir}/vdr
+install -dm 755 $RPM_BUILD_ROOT%{_includedir}/{vdr,libsi}
+cp -pLR include/* $RPM_BUILD_ROOT%{_includedir}/
 ln -s $(abs2rel %{_includedir}/vdr/config.h %{_libdir}/vdr) \
   $RPM_BUILD_ROOT%{_libdir}/vdr
-install -dm 755 $RPM_BUILD_ROOT%{_includedir}/{vdr,libsi}
-install -pm 644 *.h $RPM_BUILD_ROOT%{_includedir}/vdr
-install -pm 644 libsi/*.h $RPM_BUILD_ROOT%{_includedir}/libsi
 
 # plugins
 %if 0%{?_with_plugins:1}
@@ -426,6 +425,14 @@
 %endif
 
 %changelog
+* Sun Jan 28 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-3
+- Upstream 1.4.5-1, refresh other patches.
+- Fix xineliboutput plugin name in sysconfig's VDR_PLUGIN_ORDER.
+- Delay a bit in the init script's stop function for clean shutdown.
+- Update CDDA_TRANSPORT workaround status in commands.conf abcde example.
+- Improve /sbin/halt.local explanation in README.package.
+- Minor specfile cleanups.
+
 * Sun Jan  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-2
 - 1.4.5, Darren Salt's 1.4.4-1.ds.
 - Make it possible to disable installed plugins in plugin sysconfig snippet.


Index: vdr.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/vdr.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr.sysconfig	17 Dec 2006 20:55:06 -0000	1.2
+++ vdr.sysconfig	28 Jan 2007 11:11:18 -0000	1.3
@@ -18,7 +18,7 @@
 softdevice
 streamdev-client
 xine
-xinelibout
+xineliboutput
 tvonscreen
 osdteletext
 subtitles