rpms/vdr/devel vdr-moveto.sh,1.2,1.3 vdr.spec,1.42,1.43

[Ville Skyttä]

Author: scop

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

Modified Files:
	vdr-moveto.sh vdr.spec 
Log Message:
* Sat Apr 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-21
- Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.



Index: vdr-moveto.sh
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr-moveto.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vdr-moveto.sh	23 Nov 2008 22:02:17 -0000	1.2
+++ vdr-moveto.sh	18 Apr 2009 09:07:26 -0000	1.3
@@ -9,7 +9,8 @@
 # Move to movies: vdr-moveto.sh 00_Movies
 # Move to music: vdr-moveto.sh 00_Music
 
-videodir="/var/lib/vdr/video"
+videodir="$(sed -ne 's/^\s*VDR_OPTIONS\s*=.*\(-v\s\+\|--video\(=\|\s\+\)\)\([^[:space:])]*\).*/\3/p' /etc/sysconfig/vdr)"
+[ -n "$videodir" ] || videodir="/var/lib/vdr/video"
 
 to="$videodir/$1"
 what="$2"


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vdr.spec	14 Apr 2009 16:42:16 -0000	1.42
+++ vdr.spec	18 Apr 2009 09:07:26 -0000	1.43
@@ -24,7 +24,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -531,6 +531,9 @@
 %endif # plugins
 
 %changelog
+* Sat Apr 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-21
+- Use videodir from /etc/sysconfig/vdr if set in vdr-moveto.sh.
+
 * Tue Apr 14 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-20
 - Add ugly workarounds to "fix" build with gcc 4.4 and current DVB headers.
 - Use useradd -N instead of -n in scriptlets (#495731).