rpms/vdr-osdteletext/devel vdr-osdteletext-0.5.1-vdr15.patch, NONE, 1.1 vdr-osdteletext.spec, 1.6, 1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr-osdteletext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17784

Modified Files:
	vdr-osdteletext.spec 
Added Files:
	vdr-osdteletext-0.5.1-vdr15.patch 
Log Message:
* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.1-31
- Apply VDR 1.5+ patch from e-tobi.net Debian packages.


vdr-osdteletext-0.5.1-vdr15.patch:

--- NEW FILE vdr-osdteletext-0.5.1-vdr15.patch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 91_osdteletext-1.5.0.dpatch by Urig at vdrportal.de
## http://vdrportal.de/board/thread.php?postid=564669#post564669
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Changes for VDR >= 1.5.0.

@DPATCH@
diff -aur osdteletext-0.5.1/txtrecv.c osdteletext/txtrecv.c
--- osdteletext-0.5.1/txtrecv.c	2005-08-12 13:20:09.000000000 +0200
+++ osdteletext/txtrecv.c	2007-01-14 00:14:15.667936696 +0100
@@ -692,7 +692,9 @@
 */
 
 cTxtReceiver::cTxtReceiver(int TPid, tChannelID chan)
-#if VDRVERSNUM >= 10319
+#if VDRVERSNUM >= 10500
+ : cReceiver(chan, -1, TPid), 
+#elif VDRVERSNUM >= 10319
  : cReceiver(0, -1, TPid), 
 #else
  : cReceiver(0, -1, 1, TPid), 


Index: vdr-osdteletext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/vdr-osdteletext.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr-osdteletext.spec	16 Feb 2008 10:51:40 -0000	1.6
+++ vdr-osdteletext.spec	6 Apr 2008 17:47:41 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.5.1
-Release:        30%{?dist}
+Release:        31%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@
 Source0:        http://www.wiesweg-online.de/linux/vdr/%{name}-%{version}.tgz
 Source1:        %{name}.conf
 Patch0:         %{name}-0.5.1-i18n.patch
+Patch1:         %{name}-0.5.1-vdr15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.3.47
@@ -30,6 +31,7 @@
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0
+%patch1 -p1
 for f in HISTORY README.DE ; do
   iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f
 done
@@ -43,9 +45,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
+
 install -dm 755 $RPM_BUILD_ROOT%{cachedir}/osdteletext
+
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d
 sed -e 's|/var/cache/vdr/|%{cachedir}/|' < %{SOURCE1} \
   > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/osdteletext.conf
@@ -71,6 +76,9 @@
 
 
 %changelog
+* Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.1-31
+- Apply VDR 1.5+ patch from e-tobi.net Debian packages.
+
 * Sat Feb 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.1-30
 - Rebuild.