From 7dead81b94f8fd157117810ce44c919cddb94688 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Jul 06 2015 19:00:48 +0000 Subject: Build with proper plugin build config, fixes LDFLAGS --- diff --git a/0001-enable-usage-of-PLGCFG-1762.patch b/0001-enable-usage-of-PLGCFG-1762.patch new file mode 100644 index 0000000..30ce6d9 --- /dev/null +++ b/0001-enable-usage-of-PLGCFG-1762.patch @@ -0,0 +1,26 @@ +From 6937a8d166cf0803e20993dbc2bc19e2dbaf98ee Mon Sep 17 00:00:00 2001 +From: Christian Wieninger +Date: Sun, 16 Mar 2014 10:43:54 +0100 +Subject: [PATCH 1/5] enable usage of $(PLGCFG) (#1762) + +--- + Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile b/Makefile +index 8baad7d..0d52b38 100644 +--- a/Makefile ++++ b/Makefile +@@ -72,6 +72,9 @@ BINDIR = $(call PKGCFG,bindir) + # + TMPDIR ?= /tmp + ++PLGCFG = $(call PKGCFG,plgcfg) ++-include $(PLGCFG) ++ + ### The compiler options: + + export CFLAGS = $(call PKGCFG,cflags) +-- +2.4.3 + diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec index 57668a9..8e52a52 100644 --- a/vdr-epgsearch.spec +++ b/vdr-epgsearch.spec @@ -4,7 +4,7 @@ Name: vdr-%{pname} Version: 1.0.1 -Release: %{?beta:0.}12%{?beta}%{?dist}.2 +Release: %{?beta:0.}13%{?beta}%{?dist} Summary: Powerful schedules menu replacement plugin for VDR License: GPLv2+ @@ -19,6 +19,8 @@ Source5: %{name}-epgsearchmenu.conf 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 +# http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/commit/?id=6937a8d166cf0803e20993dbc2bc19e2dbaf98ee +Patch2: 0001-enable-usage-of-PLGCFG-1762.patch BuildRequires: vdr-devel >= 1.7.36 Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -34,6 +36,7 @@ reusable queries which can be used as dynamic "search timers" etc. %setup -q -n %{pname}-%{version}%{?beta} sed -e 's|__VARDIR__|%{vdr_vardir}|g' %{PATCH0} | %{__patch} -p1 --fuzz=0 %patch1 -p1 +%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 @@ -83,6 +86,9 @@ install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/epgsearch %changelog +* Mon Jul 6 2015 Ville Skyttä - 1.0.1-0.13.beta5 +- Build with proper plugin build config, fixes LDFLAGS + * Fri Jun 19 2015 Fedora Release Engineering - 1.0.1-0.12.beta5.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild