[vdr-osdteletext] Clean up specfile constructs no longer needed with Fedora or EL6+.

[Ville Skyttä]

commit d6a8da72da32b24ade540543b4f909d38a727788
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 6 20:30:38 2011 +0200

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

 vdr-osdteletext.spec |   43 +++++++++++++++++--------------------------
 1 files changed, 17 insertions(+), 26 deletions(-)
---
diff --git a/vdr-osdteletext.spec b/vdr-osdteletext.spec
index 7731edb..5e49b27 100644
--- a/vdr-osdteletext.spec
+++ b/vdr-osdteletext.spec
@@ -1,25 +1,18 @@
-%global pname     osdteletext
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global cachedir  %(vdr-config --cachedir   2>/dev/null || echo ERROR)
-%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%global vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
-%global __provides_exclude_from ^%{plugindir}/.*\.so.*$
+%global pname   osdteletext
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OSD teletext plugin for VDR
 
-Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://projects.vdr-developer.org/projects/show/plg-osdteletext
 Source0:        http://projects.vdr-developer.org/attachments/download/658/%{name}-%{version}.tgz
 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}
+BuildRequires:  vdr-devel >= 1.6.0-41
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description
 The OSD teletext plugin displays teletext directly on VDR's on-screen
@@ -29,7 +22,7 @@ background.
 
 %prep
 %setup -q -n %{pname}-%{version}
-sed -i -e 's|/var/cache/vdr/vtx|%{cachedir}/osdteletext|g' \
+sed -i -e 's|/var/cache/vdr/vtx|%{vdr_cachedir}/osdteletext|g' \
     osdteletext.c README README.DE txtrecv.c
 
 
@@ -38,15 +31,15 @@ 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 -dm 755 $RPM_BUILD_ROOT%{cachedir}/osdteletext
+install -dm 755 $RPM_BUILD_ROOT%{vdr_cachedir}/osdteletext
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d
-sed -e 's|/var/cache/vdr/|%{cachedir}/|' < %{SOURCE1} \
+sed -e 's|/var/cache/vdr/|%{vdr_cachedir}/|' < %{SOURCE1} \
   > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/osdteletext.conf
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/*.conf
 
@@ -55,25 +48,23 @@ cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %preun
 if [ $1 -eq 0 ] ; then
-  rm -rf %{cachedir}/osdteletext/*
+  rm -rf %{vdr_cachedir}/osdteletext/*
 fi
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING HISTORY README*
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-%{plugindir}/libvdr-%{pname}.so.%{apiver}
-%attr(-,%{vdr_user},root) %{cachedir}/osdteletext/
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%attr(-,%{vdr_user},root) %{vdr_cachedir}/osdteletext/
 
 
 %changelog
+* Sun Nov  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.9.1-2
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Sat Aug 20 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.9.1-1
 - Update to 0.9.1.
 - Use rpm >= 4.9's Provides filtering instead of the old Fedora way.