rpms/vdr-osdteletext/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-osdteletext.spec, 1.9, 1.10 vdr-osdteletext-0.5.1-i18n.patch, 1.1, NONE vdr-osdteletext-0.5.1-vdr15.patch, 1.1, NONE

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/vdr-osdteletext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10072/devel

Modified Files:
	.cvsignore sources vdr-osdteletext.spec 
Removed Files:
	vdr-osdteletext-0.5.1-i18n.patch 
	vdr-osdteletext-0.5.1-vdr15.patch 
Log Message:
* Sun Dec 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.0-1
- 0.6.0 (new community upstream), patches applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Nov 2006 08:46:24 -0000	1.2
+++ .cvsignore	14 Dec 2008 12:34:18 -0000	1.3
@@ -1 +1 @@
-vdr-osdteletext-0.5.1.tgz
+vdr-osdteletext-0.6.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Nov 2006 08:46:24 -0000	1.2
+++ sources	14 Dec 2008 12:34:19 -0000	1.3
@@ -1 +1 @@
-52c219e38a089504071237209ad114cd  vdr-osdteletext-0.5.1.tgz
+d9a1c052c4cb433dc580d718d51dde9a  vdr-osdteletext-0.6.0.tgz


Index: vdr-osdteletext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-osdteletext/devel/vdr-osdteletext.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vdr-osdteletext.spec	7 Apr 2008 20:55:05 -0000	1.9
+++ vdr-osdteletext.spec	14 Dec 2008 12:34:19 -0000	1.10
@@ -5,21 +5,19 @@
 %define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.5.1
-Release:        31%{?dist}
+Version:        0.6.0
+Release:        1%{?dist}
 Summary:        OSD teletext plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPLv2+
-URL:            http://www.wiesweg-online.de/linux/linux.html
-Source0:        http://www.wiesweg-online.de/linux/vdr/%{name}-%{version}.tgz
+URL:            http://projects.vdr-developer.org/projects/show/plg-osdteletext
+Source0:        http://projects.vdr-developer.org/attachments/download/1/%{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
-BuildRequires:  gawk
+BuildRequires:  vdr-devel >= 1.6.0
+BuildRequires:  gettext
 Requires:       vdr(abi) = %{apiver}
 
 %description
@@ -30,17 +28,14 @@
 
 %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
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
-sed -i -e s/VDRVERSION/APIVERSION/g Makefile
 
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr libvdr-%{pname}.so
+make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
 
 
 %install
@@ -56,6 +51,10 @@
   > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/osdteletext.conf
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/*.conf
 
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
+cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,7 +66,7 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README*
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
@@ -76,6 +75,9 @@
 
 
 %changelog
+* Sun Dec 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.0-1
+- 0.6.0 (new community upstream), patches applied upstream.
+
 * Mon Apr  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.1-31
 - Apply VDR 1.5+ patch from e-tobi.net Debian package.
 - Build for VDR 1.6.0.


--- vdr-osdteletext-0.5.1-i18n.patch DELETED ---


--- vdr-osdteletext-0.5.1-vdr15.patch DELETED ---