scop pushed to vdr-epgsearch (f22). "Apply upstream fix for VDR >= 2.1.2, ship COPYING as %license"

[notifications at fedoraproject.org]

>From 38e6c53cf9abb8c663c7e5423af96c1481ba2ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
Date: Thu, 19 Feb 2015 18:18:15 +0200
Subject: Apply upstream fix for VDR >= 2.1.2, ship COPYING as %license


diff --git a/0001-api-change-in-VideoDirectory.patch b/0001-api-change-in-VideoDirectory.patch
new file mode 100644
index 0000000..1e01b84
--- /dev/null
+++ b/0001-api-change-in-VideoDirectory.patch
@@ -0,0 +1,28 @@
+From f4231d4b56f0f899d39a011992da348a30e30429 Mon Sep 17 00:00:00 2001
+From: Christian Wieninger <cwieninger at gmx.de>
+Date: Sat, 27 Dec 2014 11:41:58 +0100
+Subject: [PATCH 1/4] api change in VideoDirectory
+
+---
+ uservars.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/uservars.h b/uservars.h
+index f098750..9366af0 100644
+--- a/uservars.h
++++ b/uservars.h
+@@ -538,7 +538,11 @@ class cVideodirVar : public cInternalVar {
+     cVideodirVar() : cInternalVar("videodir") {}
+     string Evaluate(const cEvent*, bool escapeStrings = false)
+ 	{
++#if APIVERSNUM > 20101
++	    return cVideoDirectory::Name();
++#else
+ 	    return VideoDirectory;
++#endif
+ 	}
+ };
+ 
+-- 
+1.9.3
+
diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec
index d052439..3a42ed5 100644
--- a/vdr-epgsearch.spec
+++ b/vdr-epgsearch.spec
@@ -4,7 +4,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.0.1
-Release:        %{?beta:0.}11%{?beta}%{?dist}.2
+Release:        %{?beta:0.}12%{?beta}%{?dist}
 Summary:        Powerful schedules menu replacement plugin for VDR
 
 License:        GPLv2+
@@ -17,6 +17,8 @@ Source4:        %{name}-quickepgsearch.conf
 Source5:        %{name}-epgsearchmenu.conf
 # Fedora specific, no need to send upstream
 Patch0:         %{name}-1.0.1.beta2-fedora.patch
+# http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/commit/?id=f4231d4b56f0f899d39a011992da348a30e30429
+Patch1:         0001-api-change-in-VideoDirectory.patch
 
 BuildRequires:  vdr-devel >= 1.7.36
 Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
@@ -31,6 +33,7 @@ reusable queries which can be used as dynamic "search timers" etc.
 %prep
 %setup -q -n %{pname}-%{version}%{?beta}
 sed -e 's|__VARDIR__|%{vdr_vardir}|g' %{PATCH0} | %{__patch} -p1 --fuzz=0
+%patch1 -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
@@ -66,7 +69,8 @@ install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/epgsearch
 
 
 %files -f %{name}.lang
-%doc COPYING HISTORY conf/ scripts/
+%license COPYING
+%doc HISTORY conf/ scripts/
 %lang(de) %doc HISTORY.DE
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/*.conf
 %{_bindir}/createcats
@@ -79,6 +83,10 @@ install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/epgsearch
 
 
 %changelog
+* Thu Feb 19 2015 Ville Skyttä <ville.skytta at iki.fi> - 1.0.1-0.12.beta5
+- Apply upstream fix for VDR >= 2.1.2
+- Ship COPYING as %%license
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-0.11.beta5.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vdr-epgsearch.git/commit/?h=f22&id=38e6c53cf9abb8c663c7e5423af96c1481ba2ed5