rpms/vdr-skinsoppalusikka/devel vdr-skinsoppalusikka.spec, 1.13, 1.14

[Ville-Pekka Vainio]

Author: vpv

Update of /cvs/pkgs/rpms/vdr-skinsoppalusikka/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10601

Modified Files:
	vdr-skinsoppalusikka.spec 
Log Message:
* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.6.4-3
- Filter out autoprovided libvdr-*.so.* (if %filter_setup is available).
- Use ISA qualified dependency to vdr(abi).
- Use %global instead of %define.



Index: vdr-skinsoppalusikka.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-skinsoppalusikka/devel/vdr-skinsoppalusikka.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- vdr-skinsoppalusikka.spec	27 Jul 2009 06:46:53 -0000	1.13
+++ vdr-skinsoppalusikka.spec	6 Sep 2009 17:22:02 -0000	1.14
@@ -1,12 +1,12 @@
-%define pname     skinsoppalusikka
-%define vardir    %(vdr-config --vardir    2>/dev/null || echo ERROR)
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%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)
 
 
 Name:           vdr-%{pname}
 Version:        1.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The "Soppalusikka" skin for VDR
 
 Group:          Applications/Multimedia
@@ -17,7 +17,11 @@ Source1:        %{name}.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.6.0 gettext
-Requires:       vdr(abi) = %{apiver}
+Requires:       vdr(abi)%{?_isa} = %{apiver}
+
+%{?filter_setup:
+%filter_provides_in %{plugindir}/.*\.so
+%filter_setup}
 
 %description
 The "Soppalusikka" is a standalone skin providing the good old "ElchiAIO"
@@ -62,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.6.4-3
+- Filter out autoprovided libvdr-*.so.* (if %%filter_setup is available).
+- Use ISA qualified dependency to vdr(abi).
+- Use %%global instead of %%define.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild