rpms/amarok/F-7 .cvsignore, 1.31, 1.32 amarok.spec, 1.83, 1.84 sources, 1.31, 1.32

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
* Thu Dec 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.8-1
- amarok-1.4.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-7/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	15 Aug 2007 11:05:54 -0000	1.31
+++ .cvsignore	21 Dec 2007 17:29:43 -0000	1.32
@@ -1 +1 @@
-amarok-1.4.7.tar.bz2
+amarok-1.4.8.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-7/amarok.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- amarok.spec	20 Dec 2007 02:44:22 -0000	1.83
+++ amarok.spec	21 Dec 2007 17:29:43 -0000	1.84
@@ -1,10 +1,12 @@
 # TODO:
 # Rio Karma support : libkarma
 
+%define _with_mp4v2 --with-mp4v2
+
 Name:       amarok
-Summary:    Media player for KDE
-Version:    1.4.7
-Release:    6%{?dist}
+Summary:    Media player
+Version:    1.4.8
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -12,55 +14,63 @@
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 #Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
-# KDE bug 147126: amarok freezes when trying to play mp3 files without mp3 support
-Patch0:     amarok-1.4.7-147126.patch
-# Fedora bug 242862: Amarok doesn't support transfer of Unicode filenames to MTP devices
-Patch1:     amarok-1.4.7-utf8.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
+# Use xdg-open to start the selected browser
+Patch2:     amarok-1.4.7-xdg.patch
+
+#BuildRequires:  automake libtool
 BuildRequires:  alsa-lib-devel
-BuildRequires:  xine-lib-devel
-# Detected by configure
-BuildRequires:  ruby, ruby-devel
-BuildRequires:  libifp-devel, libusb-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
-# Creative Nomad Jukebox
-BuildRequires:  libnjb-devel
+%{?_with_mp4v2:BuildRequires: libmp4v2-devel}
 # MTP players
 BuildRequires:  libmtp-devel
-## Gstreamer engine
-#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
-BuildRequires:  HelixPlayer
-%endif
+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} 
 
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+# To open the selected browser, works with Patch2
+Requires:  xdg-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
@@ -68,7 +78,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
 
@@ -88,26 +97,27 @@
 
 
 %prep
-%setup -q
-%patch0 -p0 -b .147126
-%patch1 -p1 -b .utf8
+%setup -q 
 
+%patch2 -p1 -b .xdg
 
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
+
 %configure \
-     --disable-debug \
+     --disable-debug --disable-warnings \
      --disable-rpath \
-     --with-gstreamer10 \
      --enable-mysql \
      --enable-postgresql \
      --with-ifp \
      --with-libgpod \
-     --without-mp4v2 \
-%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64
+%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
      --with-helix=%{_libdir}/helix \
 %endif
+     %{?_with_gstreamer} \
+     %{?_with_mp4v2} %{!?_with_mp4v2:--without-mp4v2}
+
 #     --enable-final \
 #     --with-nmm \
 #     --with-mas
@@ -122,9 +132,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 \
@@ -137,12 +144,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
 
 
@@ -170,7 +179,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING AUTHORS ChangeLog README
 %{_bindir}/amarok
 %{_bindir}/amarokapp
@@ -232,24 +241,50 @@
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
 # Helix engine
-%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64
+%ifnarch ppc64 x86_64 s390 s390x ia64 sparc sparc64 alpha
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
 %{_datadir}/services/amarok_helixengine_plugin.desktop
 %endif
 
+%files visualisation
+%defattr(-,root,root,-)
+%{_bindir}/amarok_libvisual
 
 
+%changelog
+* Thu Dec 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.8-1
+- amarok-1.4.8
 
-%files visualisation
-%defattr(-,root,root)
-%{_bindir}/amarok_libvisual
+* Fri Dec 07 2007 Alex Lancaster <alexlan[AT]fedoraproject.org> 1.4.7-14
+- Rebuild for new openssl
 
+* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproejct.org> 1.4.7-13
+- fix --with-mp4v2 handling (#346011#c5,6)
 
+* Thu Nov 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.7-12
+- --with-mp4v2 (#346011#c3)
+- fix asf/wma support (rh#346011,kde#151733)
 
-%changelog
-* Wed Dec 19 2007 Todd Zullinger <tmz at pobox.com> - 1.4.7-6
-- rebuild with libgpod-0.6.0 and libmtp-0.2.4 to support newer media player
-  devices
+* 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
+
+* Sun Oct 07 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-7
+- use xdg-open to start the configured browser
+
+* Sat Oct 06 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-6
+- add "alpha" to the list of archs where HelixPlayer is not available
+  (bug 318431)
 
 * Fri Sep 28 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-5
 - add patch 1 to fix Fedora bug 242862: Amarok doesn't support transfer


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-7/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	15 Aug 2007 11:05:54 -0000	1.31
+++ sources	21 Dec 2007 17:29:43 -0000	1.32
@@ -1 +1 @@
-f1299e142da8a69bc3cff5d585e38d43  amarok-1.4.7.tar.bz2
+7f65c4a8f3f0ff9042a5b5dd21b36cc8  amarok-1.4.8.tar.bz2