[vdr-ttxtsubs] Update to 0.2.4. Clean up specfile constructs no longer needed with Fedora or EL6+.

[Ville Skyttä]

commit 82a1d2e959d01742aaa8badd6c97cf0962fc6ccb
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 6 19:49:10 2011 +0200

    Update to 0.2.4.
    Clean up specfile constructs no longer needed with Fedora or EL6+.

 .gitignore        |    2 +-
 sources           |    2 +-
 vdr-ttxtsubs.spec |   52 +++++++++++++++++++++-------------------------------
 3 files changed, 23 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 003feb0..3c49ab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vdr-ttxtsubs-0.0.9.tar.gz
+/*.gz
diff --git a/sources b/sources
index 858af19..ea310b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56ab64069165f9906bcef01377e8a5aa  vdr-ttxtsubs-0.0.9.tar.gz
+cc8936ae1c8a2894591907d81d8ff858  vdr-ttxtsubs-0.2.4.tar.gz
diff --git a/vdr-ttxtsubs.spec b/vdr-ttxtsubs.spec
index a9e39b7..9a19cc7 100644
--- a/vdr-ttxtsubs.spec
+++ b/vdr-ttxtsubs.spec
@@ -1,28 +1,18 @@
-%global pname     ttxtsubs
-%global vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname   ttxtsubs
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
-Version:        0.0.9
-Release:        5%{?dist}
+Version:        0.2.4
+Release:        1%{?dist}
 Summary:        Teletext subtitles plugin for VDR
 
-Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/show/plg-ttxtsubs
-Source0:        http://projects.vdr-developer.org/attachments/download/94/%{name}-%{version}.tar.gz
+Source0:        http://projects.vdr-developer.org/attachments/download/725/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel >= 1.6.0
-BuildRequires:  gettext
-Requires:       vdr(abi)%{?_isa} = %{apiver}
-
-%{?filter_setup:
-%filter_provides_in %{plugindir}/.*\.so
-%filter_setup}
+BuildRequires:  vdr-devel >= 1.7.6
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description
 This VDR plugin implements displaying, recording and replaying
@@ -33,7 +23,7 @@ teletext based subtitles using the on screen display.
 %setup -q -n %{pname}-%{version}
 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}"|' \
+sed -i -e 's|ConfigDirectory("ttxtsubs")|"%{vdr_vardir}/%{pname}"|' \
     ttxtsubs.c
 
 
@@ -42,37 +32,37 @@ 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 -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 755 libvdr-%{pname}.so.%{vdr_apiversion} \
+    $RPM_BUILD_ROOT%{vdr_plugindir}
 
 install -Dpm 644 %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+    $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%{vdr_vardir}/%{pname}
+cat /dev/null >$RPM_BUILD_ROOT%{vdr_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 -f %{name}.lang
 %defattr(-,%{vdr_user},root,-)
-%dir %{vardir}/%{pname}/
-%ghost %config(noreplace) %{vardir}/%{pname}/channelsettings.dat
+%dir %{vdr_vardir}/%{pname}/
+%ghost %config(noreplace) %{vdr_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}
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
 
 
 %changelog
+* Sun Nov  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.2.4-1
+- Update to 0.2.4.
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild