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

[Ville Skyttä]

commit 9bb2d3310895232defe4b82e75e627bd28ab4385
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 6 18:50:26 2011 +0200

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

 .gitignore     |    2 +-
 sources        |    2 +-
 vdr-femon.spec |   39 +++++++++++++++------------------------
 3 files changed, 17 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d2cbfdd..17d6b36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-vdr-femon-1.6.7.tgz
+/*.tgz
diff --git a/sources b/sources
index 4e4070e..4643d74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-145c6713574d06ea673e185c299b8f71  vdr-femon-1.6.7.tgz
+42cfda8f10cd4ef6acfba11061024602  vdr-femon-1.7.10.tgz
diff --git a/vdr-femon.spec b/vdr-femon.spec
index a5bef76..00b7e66 100644
--- a/vdr-femon.spec
+++ b/vdr-femon.spec
@@ -1,26 +1,18 @@
-%global pname     femon
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname   femon
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
-Version:        1.6.7
-Release:        5%{?dist}
+Version:        1.7.10
+Release:        1%{?dist}
 Summary:        DVB frontend status monitor plugin for VDR
 
-Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.saunalahti.fi/~rahrenbe/vdr/femon/
 Source0:        http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/%{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}
-
-%{?filter_setup:
-%filter_provides_in %{plugindir}/.*\.so
-%filter_setup}
+BuildRequires:  vdr-devel >= 1.7.18
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description
 DVB frontend status monitor is a plugin that displays some signal
@@ -40,31 +32,30 @@ make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr \
 
 
 %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%{_datadir}/locale
 cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %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}
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
 
 
 %changelog
+* Sun Nov  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.7.10-1
+- Update to 1.7.10.
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild