commit fed1e83f4bb850321669d4679fe804f2fef5e856
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Tue Mar 27 23:57:07 2012 +0300
Patch to build with VDR 1.7.27.
vdr-wapd-0.9-vdr1727.patch | 33 +++++++++++++++++++++++++++++++++
vdr-wapd.spec | 7 ++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/vdr-wapd-0.9-vdr1727.patch b/vdr-wapd-0.9-vdr1727.patch
new file mode 100644
index 0000000..9d38f96
--- /dev/null
+++ b/vdr-wapd-0.9-vdr1727.patch
@@ -0,0 +1,33 @@
+diff -up wapd-0.9/i18n.h~ wapd-0.9/i18n.h
+--- wapd-0.9/i18n.h~ 2008-01-06 15:09:14.000000000 +0200
++++ wapd-0.9/i18n.h 2012-03-27 22:44:52.119360313 +0300
+@@ -25,6 +25,5 @@
+
+ #include <vdr/i18n.h>
+
+-extern const tI18nPhrase Phrases[];
+
+ #endif //__WAPD_I18N_H
+diff -up wapd-0.9/Makefile~ wapd-0.9/Makefile
+--- wapd-0.9/Makefile~ 2008-01-16 17:29:10.000000000 +0200
++++ wapd-0.9/Makefile 2012-03-27 22:45:07.755478745 +0300
+@@ -53,7 +53,7 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I
+
+ ### The object files (add further files here):
+
+-OBJS = $(PLUGIN).o server.o tools.o access.o i18n.o
++OBJS = $(PLUGIN).o server.o tools.o access.o
+
+ LIBS = -lcrypt
+
+diff -up wapd-0.9/wapd.c~ wapd-0.9/wapd.c
+--- wapd-0.9/wapd.c~ 2008-01-13 14:30:24.000000000 +0200
++++ wapd-0.9/wapd.c 2012-03-27 22:47:22.181496986 +0300
+@@ -84,7 +84,6 @@ bool cPluginWapd::ProcessArgs(int argc,
+
+ bool cPluginWapd::Start(void)
+ {
+- RegisterI18n(Phrases);
+ if (WapHosts.Load(AddDirectory(ConfigDirectory(), "waphosts"), true)
+ && WapAccess.Load(AddDirectory(ConfigDirectory(), "wapaccess"), true)
+ && (server = new cWapServer(tcpport)))
diff --git a/vdr-wapd.spec b/vdr-wapd.spec
index e4d5977..b45becd 100644
--- a/vdr-wapd.spec
+++ b/vdr-wapd.spec
@@ -5,7 +5,7 @@
Name: vdr-%{pname}
Version: 0.9
-Release: 17.patch1%{?dist}
+Release: 18.patch1%{?dist}
Summary: WAP remote control interface for VDR
License: GPLv2+
@@ -17,6 +17,7 @@ Source3: %{name}-proxy.conf
Source4: %{name}.conf
Patch0: http://www.heiligenmann.de/vdr/download/wapd-0.9-patch1.diff.gz
Patch1: %{name}-0.9-condwait.patch
+Patch2: %{name}-0.9-vdr1727.patch
BuildRequires: vdr-devel >= 1.6.0-41
BuildRequires: gawk
@@ -31,6 +32,7 @@ with WML enabled browsers such as mainstream mobile phones.
%setup -q -n %{pname}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
iconv -f iso-8859-1 -t utf-8 HISTORY > HISTORY.utf8 ; mv HISTORY.utf8 HISTORY
sed -i -e 's|/video/plugins|%{vdr_configdir}/plugins|' README
install -pm 644 %{SOURCE3} %{name}-httpd.conf
@@ -62,6 +64,9 @@ install -Dpm 644 %{SOURCE4} \
%changelog
+* Tue Mar 27 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.9-18.patch1
+- Patch to build with VDR 1.7.27.
+
* Sun Mar 11 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.9-17.patch1
- Rebuild.