rpms/vdr/devel vdr-jumpplay-1.0-1.6.0-finnish.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 vdr.spec, 1.43, 1.44

[Ville Skyttä]

Author: scop

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

Modified Files:
	.cvsignore sources vdr.spec 
Added Files:
	vdr-jumpplay-1.0-1.6.0-finnish.patch 
Log Message:
* Tue May 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-22
- Quiet usermod, avoid possible extra -v inserted to /etc/sysconfig/vdr on
  upgrades from earlier releases that used to default to /srv/vdr for video.
- Add jumpplay patch 1.0 and a Finnish translation for it.
- Update liemikuutio patch to 1.27.


vdr-jumpplay-1.0-1.6.0-finnish.patch:

--- NEW FILE vdr-jumpplay-1.0-1.6.0-finnish.patch ---
diff -up vdr-1.6.0/po/fi_FI.po~ vdr-1.6.0/po/fi_FI.po
--- vdr-1.6.0/po/fi_FI.po~	2008-03-23 12:31:29.000000000 +0200
+++ vdr-1.6.0/po/fi_FI.po	2009-05-26 23:40:29.000000000 +0300
@@ -749,6 +749,18 @@ msgstr "Jaottele muokatut tallenteet"
 msgid "Replay"
 msgstr "Toisto"
 
+msgid "Setup.Replay$Jump&Play"
+msgstr "Jatka toistoa hypyn jälkeen"
+
+msgid "Setup.Replay$Play&Jump"
+msgstr "Ohita merkityt katkot"
+
+msgid "Setup.Replay$Pause at last mark"
+msgstr "Tauko viimeisessä merkinnässä"
+
+msgid "Setup.Replay$Reload marks"
+msgstr "Merkintöjen uudelleenlataus"
+
 msgid "Setup.Replay$Multi speed mode"
 msgstr "Käytä toiston moninopeustilaa"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Apr 2009 15:27:38 -0000	1.19
+++ .cvsignore	28 May 2009 20:25:18 -0000	1.20
@@ -7,6 +7,7 @@ vdr-1.6.0-2.diff
 vdr-timer-info-0.5-1.5.15.diff
 vdr-1.6.0-2-ttxtsubs.patch
 vdr-1.6.0-subtitles-button.patch.gz
-vdr-1.6.0-liemikuutio-1.25.diff.gz
 vdr-1.6.0-ionice.patch.gz
 vdr-1.6.0-cap_sys_nice.patch.gz
+vdr-1.6.0-liemikuutio-1.27.diff.gz
+vdr-jumpplay-1.0-1.6.0.diff


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	14 Apr 2009 15:27:38 -0000	1.19
+++ sources	28 May 2009 20:25:18 -0000	1.20
@@ -7,6 +7,7 @@ e9b82b88c1fa21b6fa9734ca240f6192  timerc
 92ee6cdf60b795d9fbcf4fdcafe401b4  vdr-timer-info-0.5-1.5.15.diff
 ded3dacb4be2958c03a50e3064164eb8  vdr-1.6.0-2-ttxtsubs.patch
 bd3221bb080788a87b4560eb0f323f2b  vdr-1.6.0-subtitles-button.patch.gz
-122b40baef4d0c9a3e31e91b1c877e5b  vdr-1.6.0-liemikuutio-1.25.diff.gz
 bc2dbfe11e0ddbc791ceb2f659081c8c  vdr-1.6.0-ionice.patch.gz
 32004893569e9a68f17d2b4b93410ed5  vdr-1.6.0-cap_sys_nice.patch.gz
+189117c22de7932bbfa770091f5d36e0  vdr-1.6.0-liemikuutio-1.27.diff.gz
+1ff8f1a90e02b11a42218ffba18b5f26  vdr-jumpplay-1.0-1.6.0.diff


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- vdr.spec	18 Apr 2009 09:07:26 -0000	1.43
+++ vdr.spec	28 May 2009 20:25:18 -0000	1.44
@@ -5,6 +5,9 @@
 # - ACPI wakeup handling using "svdrpsend NEXT {ABS|REL}" output for cases
 #   where the VDR box is shut down without using the shutdown script (e.g.
 #   explicit shutdown/poweroff outside of VDR, power button press etc)
+# - pause patch (causes OSD placement issues at least with unrebuilt text2skin)
+#   http://www.tolleri.net/vdr/vdr/vdr-1.6.0-2-pause-0.0.1.patch
+#   http://thread.gmane.org/gmane.linux.vdr/40188
 
 %bcond_with       docs
 %bcond_with       plugins
@@ -24,7 +27,7 @@
 
 Name:           vdr
 Version:        1.6.0
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -53,7 +56,7 @@ Source17:       %{name}-halt.local.sh
 Patch0:         %{name}-channel+epg.patch
 # TODO
 Patch1:         http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr_1.4.5-2.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.25.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-liemikuutio-1.27.diff.gz
 Patch3:         %{name}-1.6.0-scriptnames.patch
 Patch4:         %{name}-1.6.0-paths.patch
 Patch5:         %{name}-1.5.18-use-pkgconfig.patch
@@ -83,6 +86,8 @@ Patch21:        http://www.saunalahti.fi
 Patch22:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-cap_sys_nice.patch.gz
 Patch23:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.6.0-ionice.patch.gz
 Patch24:        %{name}-1.6.0-gcc44.patch
+Patch25:        http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.6.0.diff
+Patch26:        %{name}-jumpplay-1.0-1.6.0-finnish.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -170,9 +175,6 @@ patch -F 0 -i debian/patches/10_livelock
 patch -F 0 -i debian/patches/11_atsc.dpatch
 echo "DEFINES += -DHAVE_ATSC" >> Makefile
 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 -F 0 -i debian/patches/opt-20_suspend.dpatch
 %patch2 -p1
 %patch3 -p1
 sed \
@@ -186,15 +188,15 @@ sed \
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
-patch -p0 -F 1 -i %{PATCH9}
+%patch9 -p0 -F 1
 # TODO: does not apply
 #patch10 -p0
-patch -p1 -F 2 -i %{PATCH11}
+%patch11 -p1 -F 2
 # timer-info patch needs to come before timercmd patch to avoid conflicts
 %patch17 -p1
-patch -p1 -F 2 -i %{PATCH12}
+%patch12 -p1 -F 2
 %patch13 -p1
-patch -p0 -F 2 -i %{PATCH14}
+%patch14 -p0 -F 2
 %patch15 -p0
 %patch16 -p0
 %patch18 -p1
@@ -206,8 +208,10 @@ patch -p0 -F 2 -i %{PATCH14}
 %if "%(g++ -dumpversion)" >= "4.4"
 %patch24 -p1
 %endif
+%patch25 -p1 -F 2
+%patch26 -p1
 
-for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.timer-info ; do
+for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.{jumpplay,timer-info} ; do
   iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
 done
 
@@ -427,7 +431,7 @@ if [ $1 -gt 1 -a -d /srv/vdr ] ; then
 
     # Continue to use /srv/vdr as the video dir for old setups
     f=%{_sysconfdir}/sysconfig/vdr
-    if ! grep -q '^\s*VDR_OPTIONS.* -v' $f ; then
+    if ! grep -q '^\s*VDR_OPTIONS.*[( ]-v' $f ; then
         sed -i -e 's|^\(\s*VDR_OPTIONS.*(\)\(.*\)|\1-v /srv/vdr \2|' $f
     fi
 
@@ -437,7 +441,7 @@ if [ $1 -gt 1 -a -d /srv/vdr ] ; then
     done
 
     # Set new home dir
-    usermod -d %{vardir} %{vdr_user}
+    usermod -d %{vardir} %{vdr_user} 2>/dev/null
 fi
 /sbin/chkconfig --add vdr || :
 
@@ -531,6 +535,12 @@ fi
 %endif # plugins
 
 %changelog
+* Tue May 26 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-22
+- Quiet usermod, avoid possible extra -v inserted to /etc/sysconfig/vdr on
+  upgrades from earlier releases that used to default to /srv/vdr for video.
+- Add jumpplay patch 1.0 and a Finnish translation for it.
+- Update liemikuutio patch to 1.27.
+
 * 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.