rpms/vdr/devel vdr.spec,1.29,1.30 vdr-README.package,1.6,1.7

Ville Skyttä scop at fedoraproject.org
Thu Sep 25 20:28:30 UTC 2008


Author: scop

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

Modified Files:
	vdr.spec vdr-README.package 
Log Message:
* Thu Sep 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-6
- README.package updates.
- Specfile micro-cleanups.



Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vdr.spec	7 Sep 2008 16:22:09 -0000	1.29
+++ vdr.spec	25 Sep 2008 20:27:59 -0000	1.30
@@ -21,7 +21,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -193,7 +193,6 @@
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 done
 
-# TODO: all
 cp -p %{SOURCE5} reccmds.conf
 cp -p %{SOURCE13} timercmds.conf
 sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf
@@ -298,7 +297,6 @@
 sed -i \
   -e 's|/usr/sbin/|%{_sbindir}/|'  \
   -e 's|/etc/vdr/|%{configdir}/|g' \
-  -e 's|/var/lib/vdr/|%{vardir}/|' \
   -e 's|VDR_USER|%{vdr_user}|'     \
   -e 's|VDR_GROUP|%{vdr_group}|'   \
   $RPM_BUILD_ROOT%{_initrddir}/vdr
@@ -496,6 +494,10 @@
 %endif # plugins
 
 %changelog
+* Thu Sep 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-6
+- README.package updates.
+- Specfile micro-cleanups.
+
 * Sun Sep  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-5
 - Work around Fedora buildsys not coping with "%%patch -F" (infrastructure
   ticket #817).


Index: vdr-README.package
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-README.package,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr-README.package	7 Sep 2008 15:18:36 -0000	1.6
+++ vdr-README.package	25 Sep 2008 20:28:00 -0000	1.7
@@ -69,19 +69,19 @@
 /usr/lib*/vdr/bin directory and enabled in the default vdr command
 line built by the init script.  The script writes a time some time
 before the next configured timer (given by VDR, see the file INSTALL)
-to /var/lib/vdr/acpi-wakeup in a format suitable for catting to
-/proc/acpi/alarm, and shuts down the machine.  See commentary in the
-script for how to enable it and how to grant the required permissions
-to the vdr user so it can carry out these tasks.
+as a number of seconds to /var/lib/vdr/next-wakeup, and shuts down the
+machine.  See commentary in the script for how to enable it and how to
+grant the required permissions 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 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.
+script like the supplied vdr-halt.local.sh (see same directory as this
+file) to /sbin/halt.local (remember to make it executable by the vdr
+user!)  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
 ---------------------




More information about the fedora-extras-commits mailing list