rpms/vdr-ttxtsubs/devel .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 vdr-ttxtsubs.spec, 1.6, 1.7

[Ville Skyttä]

Author: scop

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

Modified Files:
	.cvsignore sources vdr-ttxtsubs.spec 
Log Message:
* Mon Dec 15 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6-1
- 0.0.6 (new community upstream), patches applied upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Oct 2007 15:42:05 -0000	1.2
+++ .cvsignore	15 Dec 2008 22:06:38 -0000	1.3
@@ -1,2 +1 @@
-vdr-ttxtsubs-0.0.5-raastinrauta-edition.diff.gz
-vdr-ttxtsubs-0.0.5.tgz
+vdr-ttxtsubs-0.0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jan 2008 16:46:08 -0000	1.3
+++ sources	15 Dec 2008 22:06:38 -0000	1.4
@@ -1,2 +1 @@
-bea48116e61eb9c737021d05a7c092a1  vdr-ttxtsubs-0.0.5.tgz
-eccfd7fca4ba6392aff1ecf654aaa2cd  vdr-ttxtsubs-0.0.5-raastinrauta-edition.diff.gz
+eba81ec1dd347121da3e139afee1e908  vdr-ttxtsubs-0.0.6.tar.gz


Index: vdr-ttxtsubs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-ttxtsubs/devel/vdr-ttxtsubs.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr-ttxtsubs.spec	24 Nov 2008 17:37:10 -0000	1.6
+++ vdr-ttxtsubs.spec	15 Dec 2008 22:06:38 -0000	1.7
@@ -5,19 +5,19 @@
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.0.5
-Release:        6%{?dist}
+Version:        0.0.6
+Release:        1%{?dist}
 Summary:        Teletext subtitles plugin for VDR
 
 Group:          Applications/Multimedia
 License:        GPL+
-URL:            http://www.nada.kth.se/~ragge/vdr/ttxtsubs/
-Source0:        ftp://ftp.nada.kth.se/pub/home/ragge/vdr/%{name}-%{version}.tgz
+URL:            http://projects.vdr-developer.org/projects/show/plg-ttxtsubs
+Source0:        http://projects.vdr-developer.org/attachments/download/12/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
-Patch0:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-ttxtsubs-0.0.5-raastinrauta-edition.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel
+BuildRequires:  vdr-devel >= 1.6.0
+BuildRequires:  gettext
 Requires:       vdr(abi) = %{apiver}
 
 %description
@@ -27,7 +27,6 @@
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 sed -i -e '/^DVBDIR/d' -e 's|-I$(DVBDIR)/include||' Makefile
 f=HISTORY ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
 sed -i -e 's|ConfigDirectory("ttxtsubs")|"%{vardir}/%{pname}"|' \
@@ -35,34 +34,44 @@
 
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr libvdr-%{pname}.so
+make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
 
 
 %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 -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+
 install -dm 755 $RPM_BUILD_ROOT%{vardir}/%{pname}
 cat /dev/null >$RPM_BUILD_ROOT%{vardir}/%{pname}/channelsettings.dat
 
+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
 
 
-%files
+%files -f %{name}.lang
+%defattr(-,%{vdr_user},root,-)
+%dir %{vardir}/%{pname}/
+%ghost %config(noreplace) %{vardir}/%{pname}/channelsettings.dat
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README TROUBLESHOOTING
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %{plugindir}/libvdr-%{pname}.so.%{apiver}
-%defattr(-,%{vdr_user},root,-)
-%dir %{vardir}/%{pname}/
-%ghost %config(noreplace) %{vardir}/%{pname}/channelsettings.dat
 
 
 %changelog
+* Mon Dec 15 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6-1
+- 0.0.6 (new community upstream), patches applied upstream.
+
 * Mon Nov 24 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.0.5-6
 - Rebuild.