[rpms/amarok] epel10.2: - cosmetics (cleanup/sort BR's mostly)

[rpms/amarok] epel10.2: - cosmetics (cleanup/sort BR's mostly)

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/amarok
            Branch : epel10.2
            Commit : 582ca725529c3f51ebe1c920421d51d6743cc027
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2007-11-21T16:15:01+00:00
            Stats  : +43/-39 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/amarok/c/582ca725529c3f51ebe1c920421d51d6743cc027?branch=epel10.2

            Log:
            - cosmetics (cleanup/sort BR's mostly)
- omit "for KDE" from summary/description
- make gst support toggled by macro (disabled by default)

---
diff --git a/amarok.spec b/amarok.spec
index 9189984..801623b 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -2,9 +2,9 @@
 # Rio Karma support : libkarma
 
 Name:       amarok
-Summary:    Media player for KDE
+Summary:    Media player
 Version:    1.4.7
-Release:    8%{?dist}
+Release:    9%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -20,52 +20,56 @@ Patch1:     amarok-1.4.7-utf8.patch
 Patch2:     amarok-1.4.7-xdg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdemultimedia-devel >= 6:3.2
-BuildRequires:  taglib-devel >= 1.3, esound-devel
-BuildRequires:  desktop-file-utils, gettext
-BuildRequires:  libGL
-BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
-BuildRequires:  libvisual-devel >= 0.4.0, SDL-devel
-BuildRequires:  libtool-ltdl-devel
-BuildRequires:  mysql-devel, postgresql-devel
-BuildRequires:  libtunepimp-devel >= 0.4.0
-BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  xine-lib-devel
-# Detected by configure
-BuildRequires:  ruby, ruby-devel
-BuildRequires:  libifp-devel, libusb-devel
-# Ipod
-BuildRequires:  libgpod-devel
-# Creative Nomad Jukebox
-BuildRequires:  libnjb-devel
-# MTP players
-BuildRequires:  libmtp-devel
-## Gstreamer engine
-#BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  esound-devel
+BuildRequires:  gettext
+## Gstreamer engine, disabled indefinitely, see:
+##  http://amarok.kde.org/blog/archives/91-Backends,-Phonon,-GStreamer.html
+#define _with_gstreamer --with-gstreamer10
+%{?_with_gstreamer:BuildRequires:  gstreamer-plugins-base-devel gstreamer-plugins-good-devel gstreamer-devel}
 # Helix engine on archs where it is available
 %ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
 BuildRequires:  HelixPlayer
 %endif
+BuildRequires:  kdebase3-devel
+BuildRequires:  taglib-devel 
+BuildRequires:  libifp-devel
+# Ipod
+BuildRequires:  libgpod-devel
+# MTP players
+BuildRequires:  libmtp-devel
+BuildRequires:  libmusicbrainz-devel
+# Creative Nomad Jukebox
+BuildRequires:  libnjb-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  libtunepimp-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libvisual-devel
+BuildRequires:  mysql-devel
+BuildRequires:  postgresql-devel
+BuildRequires:  ruby-devel ruby
+BuildRequires:  SDL-devel
+BuildRequires:  taglib-devel
+BuildRequires:  xine-lib-devel
+BuildRequires:  xmms-devel
 
 # For some default plugins (lyrics)
-Requires:  ruby
+Requires(hint):  ruby
 
 # Bug 245386
-Requires:  kdelibs >= 6:3.5.7
+%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+Requires:  kdelibs3 >= %{kdelibs_ver} 
 
 # To open the selected browser, works with Patch2
 Requires:  xdg-utils
 
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 Provides:  amarok-devel = %{version}-%{release}
 
 
 %description
-Amarok is a KDE multimedia player with:
+Amarok is a multimedia player with:
  - fresh playlist concept, very fast to use, with drag and drop
  - plays all formats supported by the various engines
  - audio effects, like reverb and compressor
@@ -73,7 +77,6 @@ Amarok is a KDE multimedia player with:
  - nice GUI, integrates into the KDE look, but with a unique touch
 
 Amarok can use various engines to decode sound : helix and xine.
-(gstreamer is in the works)
 To use the helix engine, you'll have to install either HelixPlayer
 or RealPlayer
 
@@ -105,7 +108,6 @@ unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 %configure \
      --disable-debug \
      --disable-rpath \
-     --with-gstreamer10 \
      --enable-mysql \
      --enable-postgresql \
      --with-ifp \
@@ -114,6 +116,8 @@ unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
 %ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
      --with-helix=%{_libdir}/helix \
 %endif
+     %{?_with_gstreamer}
+
 #     --enable-final \
 #     --with-nmm \
 #     --with-mas
@@ -128,9 +132,6 @@ rm -fr $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
 # desktop files
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
-
 desktop-file-install  --vendor "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
         --delete-original \
@@ -176,7 +177,7 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/amarok
 %{_bindir}/amarokapp
@@ -244,15 +245,18 @@ rm -fr $RPM_BUILD_ROOT
 %endif
 
 
-
-
 %files visualisation
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/amarok_libvisual
 
 
 
 %changelog
+* Tue Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.7-9
+- cosmetics (cleanup/sort BR's mostly)
+- omit "for KDE" from summary/description
+- make gst support toggled by macro (disabled by default)
+
 * Sat Nov 10 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.4.7-8
 - rebuild