[audacious-plugins] Use %_isa in more dependencies. Drop unneeded BuildRoot stuff. Drop %defattr lines. Drop old -wavpac

[Michael Schwendt]

commit d585aee9e371b49d78162625a3171d7b04d53cd3
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Sep 16 22:01:01 2011 +0200

    Use %_isa in more dependencies.
    Drop unneeded BuildRoot stuff.
    Drop %defattr lines.
    Drop old -wavpack and -vortex Obsoletes/Provides.

 audacious-plugins.spec |   41 +++++++++++++----------------------------
 1 files changed, 13 insertions(+), 28 deletions(-)
---
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 1a35d5d..d410db2 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -6,11 +6,11 @@
 
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
 %global aud_ver 3.0
-Requires: audacious >= %{aud_ver}
+Requires: audacious%{?_isa} >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 3.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -63,21 +63,9 @@ BuildRequires: libbs2b-devel
 BuildRequires: curl-devel
 BuildRequires: libsmbclient-devel
 
-#%if 0%{?fedora} > 13
-## crashes with GCC < 4.5
-#BuildRequires: libprojectM-devel gtkglext-devel
-#%endif
-
 # experimental, disabled by default
 BuildRequires: neon-devel
 
-# last tagged dist-f13-updates
-# obsolete old subpackage -- no reason to split this off
-Obsoletes: audacious-plugins-wavpack < 2.4
-Provides: audacious-plugins-wavpack = %{version}-%{release}
-Obsoletes: audacious-plugins-vortex < 2.4
-Provides: audacious-plugins-vortex = %{version}-%{release}
-
 # last tagged dist-f14 and dist-f13-updates
 Obsoletes: audacious-plugins-esd < 2.4-0.6
 
@@ -97,7 +85,7 @@ itself forked from XMMS.
 Summary: Audacious output plugin for Jack Audio Connection Kit
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
-Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
+Requires: audacious%{?_isa} >= %{aud_ver}, audacious-plugins%{?_isa} >= %{aud_ver}
 
 %description jack
 This package provides an Audacious output plugin that uses the
@@ -108,7 +96,7 @@ Jack Audio Connection Kit (JACK) sound service.
 Summary: Optional niche market plugins for Audacious 
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
-Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
+Requires: audacious%{?_isa} >= %{aud_ver}, audacious-plugins%{?_isa} >= %{aud_ver}
 # temporarily only:
 %if 0%{?fedora} > 14
 # subpkg was available during F-15 development
@@ -130,7 +118,7 @@ Nintendo DS Sound Format 2SF.
 Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
-Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
+Requires: audacious%{?_isa} >= %{aud_ver}, audacious-plugins%{?_isa} >= %{aud_ver}
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -143,7 +131,7 @@ input plugin for Audacious.
 Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
 %{?aud_plugin_dep}
-Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
+Requires: audacious%{?_isa} >= %{aud_ver}, audacious-plugins%{?_isa} >= %{aud_ver}
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -191,7 +179,7 @@ make %{?_smp_mflags}
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 %find_lang %{name}
 # audacious-sid.desktop
 desktop-file-install --vendor "" \
@@ -212,10 +200,6 @@ desktop-file-install --vendor "" \
 [ -f ${RPM_BUILD_ROOT}%{_libdir}/audacious/Output/pulse_audio.so ]
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post sid
 update-desktop-database &> /dev/null || :
 
@@ -231,7 +215,6 @@ update-desktop-database &> /dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %dir %{_libdir}/audacious
 %{_libdir}/audacious/Input/
@@ -253,11 +236,9 @@ update-desktop-database &> /dev/null || :
 %exclude %{_libdir}/audacious/Output/jackout.so
 
 %files jack
-%defattr(-,root,root,-)
 %{_libdir}/audacious/Output/jackout.so
 
 %files exotic
-%defattr(-,root,root,-)
 %{_libdir}/audacious/Input/adplug.so
 %{_libdir}/audacious/Input/console.so
 %{_libdir}/audacious/Input/psf2.so
@@ -265,18 +246,22 @@ update-desktop-database &> /dev/null || :
 %{_libdir}/audacious/Input/xsf.so
 
 %files amidi
-%defattr(-,root,root,-)
 %{_libdir}/audacious/Input/amidi-plug.so
 %{_libdir}/audacious/Input/amidi-plug/
 %{_datadir}/applications/audacious-amidi.desktop
 
 %files sid
-%defattr(-,root,root,-)
 %{_libdir}/audacious/Input/sid.so
 %{_datadir}/applications/audacious-sid.desktop
 
 
 %changelog
+* Fri Sep 16 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.2-3
+- Use %%_isa in more dependencies.
+- Drop unneeded BuildRoot stuff.
+- Drop %%defattr lines.
+- Drop old -wavpack and -vortex Obsoletes/Provides.
+
 * Thu Sep  8 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.2-2
 - Merge changes from pre-3.0.3 git, such as using libmodplug system
   library (BR libmodplug-devel).