[vdr-skinsoppalusikka] Update to 1.7.4 for VDR 1.7 Update the spec to use the new vdr packaging macros

[Ville-Pekka Vainio]

commit a104f1b73a2ece0d744c507b67d14551dbe0c706
Author: Ville-Pekka Vainio <vpvainio at iki.fi>
Date:   Sat Nov 19 00:35:50 2011 +0200

    Update to 1.7.4 for VDR 1.7
    Update the spec to use the new vdr packaging macros

 .gitignore                |    1 +
 sources                   |    2 +-
 vdr-skinsoppalusikka.spec |   32 +++++++++++++++-----------------
 3 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4703d2b..562951a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 vdr-skinsoppalusikka-1.6.5.tgz
+/vdr-skinsoppalusikka-1.7.4.tgz
diff --git a/sources b/sources
index 48d9ec2..35c347c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0782f37313d49d611bfee3596e0841aa  vdr-skinsoppalusikka-1.6.5.tgz
+0949bbb83feba144dfc72a031af34a16  vdr-skinsoppalusikka-1.7.4.tgz
diff --git a/vdr-skinsoppalusikka.spec b/vdr-skinsoppalusikka.spec
index d02cf0b..87d2ddf 100644
--- a/vdr-skinsoppalusikka.spec
+++ b/vdr-skinsoppalusikka.spec
@@ -1,12 +1,9 @@
 %global pname     skinsoppalusikka
-%global vardir    %(vdr-config --vardir    2>/dev/null || echo ERROR)
-%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
-
+%global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
 
 Name:           vdr-%{pname}
-Version:        1.6.5
-Release:        3%{?dist}
+Version:        1.7.4
+Release:        1%{?dist}
 Summary:        The "Soppalusikka" skin for VDR
 
 Group:          Applications/Multimedia
@@ -16,12 +13,9 @@ Source0:        http://www.saunalahti.fi/~rahrenbe/vdr/soppalusikka/files/%{name
 Source1:        %{name}.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel >= 1.6.0 gettext
-Requires:       vdr(abi)%{?_isa} = %{apiver}
+BuildRequires:  vdr-devel >= 1.7.0 gettext
+Requires:       vdr(abi)%{?_isa} = %{vdr_apiversion}
 
-%{?filter_setup:
-%filter_provides_in %{plugindir}/.*\.so
-%filter_setup}
 
 %description
 The "Soppalusikka" is a standalone skin providing the good old "ElchiAIO"
@@ -42,13 +36,13 @@ rm -rf $RPM_BUILD_ROOT
 # "build" the translations
 make i18n LOCALEDIR=$RPM_BUILD_ROOT%{_datadir}/locale
 # install the plugin and the config file
-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
 # install the themes
-install -dm 755 $RPM_BUILD_ROOT%{vardir}/themes
-install -pm 644 themes/*.theme $RPM_BUILD_ROOT%{vardir}/themes/
+install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/themes
+install -pm 644 themes/*.theme $RPM_BUILD_ROOT%{vdr_vardir}/themes/
 
 %find_lang %{name}
 
@@ -61,11 +55,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-%{plugindir}/libvdr-%{pname}.so.%{apiver}
-%{vardir}/themes/soppalusikka-*.theme
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%{vdr_vardir}/themes/soppalusikka-*.theme
 
 
 %changelog
+* Tue Nov 15 2011 Ville-Pekka Vainio <vpvainio AT iki.fi> 1.7.4-1
+- Update to 1.7.4 for VDR 1.7
+- Update the spec to use the new vdr packaging macros
+
 * Sun Nov  6 2011 Ville Skyttä <ville.skytta at iki.fi> - 1.6.5-3
 - Rebuild.