rpms/amarok/F-8 amarok.spec,1.88,1.89

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14245

Modified Files:
	amarok.spec 
Log Message:
sync w/devel, mostly:
* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.7-12
- --with-mp4v2 (rh#346011)
- fix asf/wma support (rh#346011,kde#151733)

* Wed Nov 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.7-11
- dynamic mode floods playlist ... (kde #148317)
...

* 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)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-8/amarok.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- amarok.spec	10 Nov 2007 06:56:59 -0000	1.88
+++ amarok.spec	29 Nov 2007 20:39:57 -0000	1.89
@@ -1,10 +1,12 @@
 # TODO:
 # Rio Karma support : libkarma
 
+%define _with_mp4v2 --with-mp4v2
+
 Name:       amarok
-Summary:    Media player for KDE
+Summary:    Media player
 Version:    1.4.7
-Release:    8%{?dist}
+Release:    12%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -18,54 +20,66 @@
 Patch1:     amarok-1.4.7-utf8.patch
 # Use xdg-open to start the selected browser
 Patch2:     amarok-1.4.7-xdg.patch
+# http://bugs.kde.org/148317 - dynamic mode floods playlist ...
+# http://websvn.kde.org/branches/stable/extragear/multimedia/amarok/src/playlist.cpp?r1=705494&r2=705493&pathrev=705494&view=patch
+Patch3:     amarok-1.4.7-148317.patch 
+# fix asf/wma support (with recent taglib)
+# svn diff amarok/src/metadata --revision 705231
+Patch4:     amarok-asf.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:  automake libtool
 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
+%{?_with_mp4v2:BuildRequires: libmp4v2-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 +87,6 @@
  - 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
 
@@ -93,11 +106,16 @@
 
 
 %prep
-%setup -q
+%setup -q 
+
 %patch0 -p0 -b .147126
 %patch1 -p1 -b .utf8
 %patch2 -p1 -b .xdg
+%patch3 -p4 -b .148317
+%patch4 -p0 -b .asf
 
+# for patch4
+make -f admin/Makefile.common 
 
 
 %build
@@ -105,7 +123,6 @@
 %configure \
      --disable-debug \
      --disable-rpath \
-     --with-gstreamer10 \
      --enable-mysql \
      --enable-postgresql \
      --with-ifp \
@@ -114,6 +131,9 @@
 %ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
      --with-helix=%{_libdir}/helix \
 %endif
+     %{?_with_gstreamer} \
+     %{?_with_livm4v2}
+
 #     --enable-final \
 #     --with-nmm \
 #     --with-mas
@@ -128,9 +148,6 @@
 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 \
@@ -143,12 +160,14 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
-%find_lang %{name}
+%find_lang %{name} 
 # HTML
 for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
-  lang=$(basename $lang_dir)
-  [ "$lang" == "en" ] && d=en/%{name} || d=$lang
-  echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    [ "$lang" == "en" ] && d=en/%{name} || d=$lang
+    echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
+  fi
 done
 
 
@@ -176,7 +195,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/amarok
 %{_bindir}/amarokapp
@@ -243,16 +262,27 @@
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
-
-
-
 %files visualisation
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/amarok_libvisual
 
 
-
 %changelog
+* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.7-12
+- --with-mp4v2 (rh#346011)
+- fix asf/wma support (rh#346011,kde#151733)
+
+* Wed Nov 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.7-11
+- dynamic mode floods playlist ... (kde #148317)
+
+* Wed Nov 21 2007 Todd Zullinger <tmz at pobox.com> 1.4.7-10
+- rebuild for libgpod-0.6.0
+
+* 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 at fedoraproject.org> 1.4.7-8
 - rebuild