[vdr-epgsearch] Apply upstream patch for VDR 1.7.25.

[Ville Skyttä]

commit c4ff2147e0834db2de446cdb1e9a878f73709336
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Mar 6 23:04:24 2012 +0200

    Apply upstream patch for VDR 1.7.25.

 vdr-epgsearch-1.0.0-vdr1725.patch |   44 +++++++++++++++++++++++++++++++++++++
 vdr-epgsearch.spec                |    7 +++++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/vdr-epgsearch-1.0.0-vdr1725.patch b/vdr-epgsearch-1.0.0-vdr1725.patch
new file mode 100644
index 0000000..21f029f
--- /dev/null
+++ b/vdr-epgsearch-1.0.0-vdr1725.patch
@@ -0,0 +1,44 @@
+commit 15d08ffb09de612ae1eb53b2aeca2f906f7076a6
+Author: Christian Wieninger <cwieninger at gmx.de>
+Date:   Sun Mar 4 09:44:19 2012 +0100
+
+    support for vdr 1.7.25
+
+diff --git a/Makefile b/Makefile
+index 0397217..4a72b41 100644
+--- a/Makefile
++++ b/Makefile
+@@ -64,7 +64,7 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -Wno-format-y2k
+ 
+ ### The directory environment:
+ 
+-DVBDIR = ../../../../DVB
++#DVBDIR = ../../../../DVB
+ VDRDIR = ../../..
+ LIBDIR = ../../lib
+ TMPDIR = /tmp
+diff --git a/conflictcheck.h b/conflictcheck.h
+index fcc6dcb..7e6fb7a 100644
+--- a/conflictcheck.h
++++ b/conflictcheck.h
+@@ -163,12 +163,20 @@ class cConflictCheckDevice
+ 				result = true;
+ #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
+ 			    else
++#if APIVERSNUM < 10725
+ 				result = Priority >= Setup.PrimaryLimit;
++#else
++				result = Priority >= 0;
++#endif
+ #endif
+ #endif
+ 			}
+ 			else
++#if APIVERSNUM < 10725
+ 			    result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
++#else
++			    result = !IsPrimaryDevice() || Priority >= 0;
++#endif
+ 		    }
+ 		    else
+ 			needsDetachReceivers = true;
diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec
index 5e1cf12..fd1b0aa 100644
--- a/vdr-epgsearch.spec
+++ b/vdr-epgsearch.spec
@@ -4,7 +4,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.0.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Powerful schedules menu replacement plugin for VDR
 
 License:        GPLv2+
@@ -18,6 +18,7 @@ Source5:        %{name}-epgsearchmenu.conf
 # Fedora specific, no need to send upstream
 Patch0:         %{name}-0.9.25.beta21-fedora.patch
 Patch1:         %{name}-1.0.0-svdrpport-6419.patch
+Patch2:         %{name}-1.0.0-vdr1725.patch
 
 BuildRequires:  vdr-devel >= 1.6.0-41
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -35,6 +36,7 @@ sed -e 's|__VARDIR__|%{vdr_vardir}|g' %{PATCH0} | %{__patch} -p1 --fuzz=0
 %if %{svdrpport} == 6419
 %patch1 -p1
 %endif
+%patch2 -p1
 
 for f in scripts/epgsearchcmds-french.conf conf/epgsearchcats.conf-tvm2vdr* ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -100,6 +102,9 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 
 
 %changelog
+* Tue Mar  6 2012 Ville Skyttä <ville.skytta at iki.fi> - 1.0.0-10
+- Apply upstream patch for VDR 1.7.25.
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-9
 - Rebuilt for c++ ABI breakage