[audacious] Use %_isa in more dependencies. Drop unneeded BuildRoot stuff. Drop %defattr lines. Drop explicit pk

[Michael Schwendt]

commit 4ba29dc88311611f446fe1c78c769614eabd774a
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Sep 16 21:55:35 2011 +0200

    Use %_isa in more dependencies.
    Drop unneeded BuildRoot stuff.
    Drop %defattr lines.
    Drop explicit pkgconfig dependency.

 audacious.spec |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/audacious.spec b/audacious.spec
index b42da90..71e0dc2 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -6,7 +6,7 @@
 
 Name: audacious
 Version: 3.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3
 Summary: Advanced audio player
@@ -15,8 +15,6 @@ Group: Applications/Multimedia
 
 Source0: http://distfiles.atheme.org/audacious-%{version}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires: gettext
 BuildRequires: gtk3-devel
 BuildRequires: libmowgli-devel >= 0.9
@@ -33,11 +31,11 @@ Requires: libmowgli%{?_isa} >= 0.9
 
 # The automatic SONAME dependency is not enough
 # during version upgrades.
-Requires: audacious-libs = %{version}-%{release}
+Requires: audacious-libs%{?_isa} = %{version}-%{release}
 
 # For compatibility with the plugin API implemented by the player,
 # a minimum version of the base plugins package is strictly required.
-Requires: audacious-plugins >= %{aud_ver}
+Requires: audacious-plugins%{?_isa} >= %{aud_ver}
 
 # Audacious stores its own icon(s) in the hicolor tree
 # and updates the icon cache.
@@ -74,12 +72,11 @@ Library files for the Audacious audio player.
 %package devel
 Summary: Development files for the Audacious audio player
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: glib2-devel gtk2-devel
 Requires: dbus-glib-devel
 Requires: libmcs-devel
 Requires: libmowgli-devel
-Requires: pkgconfig
 
 %description devel
 Files needed when building software for the Audacious audio player.
@@ -110,14 +107,13 @@ doxygen Doxyfile
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
+find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
 %find_lang %{name}
 
 desktop-file-install  \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications  \
     --remove-mime-type audio/mp3  \
     --remove-mime-type audio/mpeg  \
     --remove-mime-type audio/mpegurl  \
@@ -128,11 +124,7 @@ desktop-file-install  \
     --remove-mime-type audio/x-musepack  \
     --remove-mime-type audio/prs.sid  \
     --remove-mime-type audio/midi  \
-    $RPM_BUILD_ROOT%{_datadir}/applications/audacious.desktop
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+    ${RPM_BUILD_ROOT}%{_datadir}/applications/audacious.desktop
 
 
 %post
@@ -155,7 +147,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS README
 # not updated since 2.1.0
 #%doc NEWS
@@ -168,14 +159,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/*/apps/%{name}*.*
 
 %files libs
-%defattr(-,root,root,-)
 # license file included also in this subpkg
 # for Fedora Licensing Guidelines change (2010-07-07)
 %doc COPYING GPL2.txt GPL3.txt
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc doc/html
 %{_includedir}/audacious/
 %{_includedir}/libaudcore/
@@ -185,6 +174,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Sep 16 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.2-2
+- Use %%_isa in more dependencies.
+- Drop unneeded BuildRoot stuff.
+- Drop %%defattr lines.
+- Drop explicit pkgconfig dependency.
+
 * Thu Aug 25 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 3.0.2-1
 - Update to 3.0.2 (just a few fixes plus translation updates).