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

[Ville Skyttä]

commit 04a2acb902f1aa3b1838c0149650b4dfdd08c5c2
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Nov 6 20:15:28 2011 +0200

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

 .gitignore    |    3 +--
 vdr-wapd.spec |   42 +++++++++++++++++-------------------------
 2 files changed, 18 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de08a80..0f7081e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-vdr-wapd-0.9.tgz
-wapd-0.9-patch1.diff.gz
+/*gz
diff --git a/vdr-wapd.spec b/vdr-wapd.spec
index d38f12d..57129fd 100644
--- a/vdr-wapd.spec
+++ b/vdr-wapd.spec
@@ -1,18 +1,13 @@
 # TODO: should be proxy friendlier by using relative URLs!
 
-%global pname     wapd
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global configdir %(vdr-config --configdir  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}/
+%global pname   wapd
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
 Version:        0.9
-Release:        10.patch1%{?dist}
+Release:        11.patch1%{?dist}
 Summary:        WAP remote control interface for VDR
 
-Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html
 Source0:        http://www.heiligenmann.de/vdr/download/%{name}-%{version}.tgz
@@ -22,11 +17,10 @@ Source3:        %{name}-proxy.conf
 Source4:        %{name}.conf
 Patch0:         http://www.heiligenmann.de/vdr/download/wapd-0.9-patch1.diff.gz
 Patch1:         %{name}-0.9-condwait.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel >= 1.4.4
+BuildRequires:  vdr-devel >= 1.6.0-41
 BuildRequires:  gawk
-Requires:       vdr(abi)%{?_isa} = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
 %description
 The wapd plugin enables VDR to be remotely controlled using a WML interface
@@ -38,7 +32,7 @@ with WML enabled browsers such as mainstream mobile phones.
 %patch0 -p1
 %patch1 -p1
 iconv -f iso-8859-1 -t utf-8 HISTORY > HISTORY.utf8 ; mv HISTORY.utf8 HISTORY
-sed -i -e 's|/video/plugins|%{configdir}/plugins|' README
+sed -i -e 's|/video/plugins|%{vdr_configdir}/plugins|' README
 install -pm 644 %{SOURCE3} %{name}-httpd.conf
  
 
@@ -47,32 +41,30 @@ make %{?_smp_mflags} LIBDIR=. 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 755 wappasswd $RPM_BUILD_ROOT%{_bindir}/wappasswd
-install -Dpm 640 %{SOURCE1} $RPM_BUILD_ROOT%{configdir}/plugins/waphosts
-install -Dpm 640 %{SOURCE2} $RPM_BUILD_ROOT%{configdir}/plugins/wapaccess
+install -Dpm 640 %{SOURCE1} $RPM_BUILD_ROOT%{vdr_configdir}/plugins/waphosts
+install -Dpm 640 %{SOURCE2} $RPM_BUILD_ROOT%{vdr_configdir}/plugins/wapaccess
 install -Dpm 644 %{SOURCE4} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc gpl-2.0.txt HISTORY README %{name}-httpd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %{_bindir}/wappasswd
-%{plugindir}/libvdr-%{pname}.so.%{apiver}
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
 %defattr(-,%{vdr_user},root,-)
-%config(noreplace) %{configdir}/plugins/wapaccess
-%config(noreplace) %{configdir}/plugins/waphosts
+%config(noreplace) %{vdr_configdir}/plugins/wapaccess
+%config(noreplace) %{vdr_configdir}/plugins/waphosts
 
 
 %changelog
+* Sun Nov  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.9-11.patch1
+- Clean up specfile constructs no longer needed with Fedora or EL6+.
+
 * Thu Mar  3 2011 Ville Skyttä <ville.skytta at iki.fi> - 0.9-10.patch1
 - Filter autogenerated plugin lib Provides (rpmbuild >= 4.9).