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

[Ville Skyttä]

commit f052de3506e4ae8970b7e819cae2e1c17df4b8a3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 6 20:18:19 2011 +0200

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

 .gitignore      |    3 +--
 vdr-remote.spec |   34 ++++++++++++----------------------
 2 files changed, 13 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c4e11b..0f7081e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-vdr-plugin-remote_0.3.8-3.ds.diff.gz
-vdr-remote-0.4.0.tgz
+/*gz
diff --git a/vdr-remote.spec b/vdr-remote.spec
index 49b8086..da407c0 100644
--- a/vdr-remote.spec
+++ b/vdr-remote.spec
@@ -1,14 +1,11 @@
-%global pname     remote
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-%global vdr_group %(vdr-config --group      2>/dev/null || echo ERROR)
+%global pname   remote
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
 Version:        0.4.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Extended remote control plugin for VDR
 
-Group:          Applications/Multimedia
 License:        GPL+
 URL:            http://www.escape-edv.de/endriss/vdr/
 Source0:        http://www.escape-edv.de/endriss/vdr/%{name}-%{version}.tgz
@@ -18,17 +15,12 @@ Source2:        %{name}-udev.rules
 Patch0:         http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr-plugin-remote_0.3.8-3.ds.diff.gz
 # Non-upstreamable; upstream VDR 1.6.x lacks *.pc, no better alternative yet
 Patch1:         %{name}-0.4.0-i18ndetect.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel >= 1.3.47
+BuildRequires:  vdr-devel >= 1.6.0-41
 BuildRequires:  gettext
-Requires:       vdr(abi)%{?_isa} = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 Requires:       udev
 
-%{?filter_setup:
-%filter_provides_in %{plugindir}/.*\.so
-%filter_setup}
-
 %description
 This plugin extends VDR's remote control capabilities, adding support
 for Linux input devices, keyboards (tty), TCP connections, and LIRC.
@@ -59,12 +51,12 @@ make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 make install LIBDIR=. VDRDIR=%{_libdir}/vdr # ugh
 
-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
@@ -83,19 +75,17 @@ sed -e 's/VDR_GROUP/%{vdr_group}/' < %{SOURCE2} \
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc CONTRIBUTORS COPYING FAQ HISTORY README
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
-%{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.4.0-12
+- 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.4.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild