rpms/vdr-tvonscreen/devel vdr-tvonscreen.spec,1.6,1.7

[Ville-Pekka Vainio]

Author: vpv

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

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



Index: vdr-tvonscreen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-tvonscreen/devel/vdr-tvonscreen.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vdr-tvonscreen.spec	27 Jul 2009 06:48:11 -0000	1.6
+++ vdr-tvonscreen.spec	6 Sep 2009 17:24:33 -0000	1.7
@@ -1,11 +1,11 @@
-%define pname     tvonscreen
-%define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
-%define datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
-%define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
+%global pname     tvonscreen
+%global plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%global datadir   %(vdr-config --datadir    2>/dev/null || echo ERROR)
+%global apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
 Version:        1.0.141
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Enhanced EPG data viewer for VDR
 
 Group:          Applications/Multimedia
@@ -22,7 +22,11 @@ Patch2:         tvonscreen-1.0.141-i18n-
 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
 This VDR plugin shows EPG data on VDR's OSD in a similar way as a TV
@@ -68,6 +72,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 06 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 1.0.141-7
+- 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.0.141-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild