[vdr] Update to 1.7.26.

[Ville Skyttä]

commit 684829c93fde16a69e1eb1303be95bec8adfbceb
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Mar 11 16:20:00 2012 +0200

    Update to 1.7.26.

 sources                   |    5 +++--
 vdr-1.7.25-jumpplay.patch |    6 +-----
 vdr.spec                  |    9 +++++++--
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/sources b/sources
index c5af897..8d16692 100644
--- a/sources
+++ b/sources
@@ -5,5 +5,6 @@ fae3698214bd45de1f675c2b037d5f3b  vdr-1.7.21-ttxtsubs.patch
 71f7281d55eba1957f4267f596b11e29  vdr.epgsearch-exttimeredit-0.0.2.diff
 925d44ca8a2d10a4b84f1d47e617fc46  vdr-1.7.22-hlcutter-0.2.2.diff
 d40db7bea1b9af94d7625e611ef3dae2  vdr_1.7.23-1.debian.tar.bz2
-a3fd482a3dd8027706d4f32a88c6bd13  vdr-1.7.25.tar.bz2
-c9244542ededd068e7417d1697e58271  vdr-1.7.25-liemikuutio-1.34.patch.gz
+eb57398e44935ecb0bfc532bdfead312  vdr-1.7.26.tar.bz2
+37bc531491e4829083acdce32b930155  vdr-1.7.26-finnish.patch.gz
+4d2008ae755cf3ab56b7f54f7e3c0366  vdr-1.7.26-liemikuutio-1.34.patch.gz
diff --git a/vdr-1.7.25-jumpplay.patch b/vdr-1.7.25-jumpplay.patch
index 15020e3..3335073 100644
--- a/vdr-1.7.25-jumpplay.patch
+++ b/vdr-1.7.25-jumpplay.patch
@@ -34,15 +34,11 @@ diff -up vdr-1.7.25/config.c~ vdr-1.7.25/config.c
 diff -up vdr-1.7.25/config.h~ vdr-1.7.25/config.h
 --- vdr-1.7.25/config.h~	2012-02-29 14:28:01.000000000 +0200
 +++ vdr-1.7.25/config.h	2012-03-04 19:47:50.264715834 +0200
-@@ -30,6 +30,8 @@
- #define APIVERSION  "1.7.25"
- #define APIVERSNUM   10725  // Version * 10000 + Major * 100 + Minor
+@@ -32,2 +32,4 @@
  
 +#define JUMPPLAYVERSNUM 100
 +
  // When loading plugins, VDR searches them by their APIVERSION, which
- // may be smaller than VDRVERSION in case there have been no changes to
- // VDR header files since the last APIVERSION. This allows compiled
 @@ -307,6 +309,9 @@ public:
    int ShowReplayMode;
    int ShowRemainingTime;
diff --git a/vdr.spec b/vdr.spec
index d47a594..43092a1 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -24,7 +24,7 @@
 %global migrfile %{_var}/run/systemd-migr_%{name}-%{version}-%{release}.%{_arch}
 
 Name:           vdr
-Version:        1.7.25
+Version:        1.7.26
 Release:        1%{?dist}
 Summary:        Video Disk Recorder
 
@@ -53,7 +53,7 @@ Source19:       %{name}-check-setup.sh
 Source20:       %{name}-rcu.conf
 Patch0:         %{name}-channel+epg.patch
 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.7.25-liemikuutio-1.34.patch.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.26-liemikuutio-1.34.patch.gz
 # Extracted from http://copperhead.htpc-forum.de/downloads/extensionpatch/extpngvdr1.7.21v1.diff.gz
 Patch3:         %{name}-1.7.21-plugin-missing.patch
 Patch4:         %{name}-1.7.22-paths.patch
@@ -74,6 +74,7 @@ Patch11:        %{name}-1.7.25-mainmenuhooks101.patch
 # Modified so that it applies over the timer-info patch
 Patch12:        %{name}-1.7.21-timercmd.patch
 Patch13:        http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr-1.5.17-progressbar-support-0.0.1.diff
+Patch14:        http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.7.26-finnish.patch.gz
 Patch15:        %{name}-1.7.21-fedora-pkgconfig.patch
 Patch16:        %{name}-1.7.21-jumpplay-finnish.patch
 Patch17:        http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/plain/patches/vdr.epgsearch-exttimeredit-0.0.2.diff
@@ -205,6 +206,7 @@ sed \
 %patch12 -p1
 # TODO: does not apply
 #patch13 -p1
+%patch14 -p1
 %patch15 -p0
 %patch16 -p1
 # TODO: build failure
@@ -548,6 +550,9 @@ rm -f %{migrfile} &>/dev/null || :
 
 
 %changelog
+* Sun Mar 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.26-1
+- Update to 1.7.26.
+
 * Tue Mar  6 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.7.25-1
 - Update to 1.7.25; RCU functionality split into -rcu plugin subpackage.