rpms/amarok/FC-3 .cvsignore, 1.9, 1.10 amarok.spec, 1.12, 1.13 sources, 1.9, 1.10

Wed Sep 21 08:58:13 UTC 2005

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27192/FC-3

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.3.2
- remove patch 4 (applied upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10

--- .cvsignore	24 May 2005 10:56:28 -0000	1.9
+++ .cvsignore	21 Sep 2005 08:58:11 -0000	1.10
@@ -1 +1 @@
-amarok-1.2.4.tar.bz2
+amarok-1.3.2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/amarok.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- amarok.spec	29 May 2005 13:51:39 -0000	1.12
+++ amarok.spec	21 Sep 2005 08:58:11 -0000	1.13
@@ -6,14 +6,16 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.2.4
+Version:    1.3.2
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.2.4.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.2.tar.bz2
 Patch0:     amarok-1.2.4-gcc4bl.patch
+Patch2:     amarok-1.3-engines-cfg.patch
+Patch3:     amarok-1.3-endian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -23,10 +25,9 @@
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
-%if "%fedora" >= "4"
 BuildRequires:  libtool-ltdl-devel
-%else
-BuildRequires:  libtool
+%ifnarch ppc64 x86_64 s390 s390x ia64
+BuildRequires:  HelixPlayer
 %endif
 
 %if  0%{?use_xine}
@@ -36,14 +37,22 @@
 
 Requires:   kdemultimedia >= 6:3.2
 
+Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
+
+
 %description
 Amarok is a KDE multimedia player with:
  - fresh playlist concept, very fast to use, with drag and drop
- - plays all formats supported by aRts, gstreamer or xine
+ - plays all formats supported by the various engines
  - audio effects, like reverb and compressor
  - compatible with the .m3u and .pls formats for playlists
  - nice GUI, integrates into the KDE look, but with a unique touch
 
+Amarok can use various engines to decode sound : gstreamer, arts,
+helix and xine (disabled by default for patent reasons)
+To use the helix engine, you'll have to install either HelixPlayer
+or RealPlayer
+
 
 %package visualisation
 Summary:    Visualisation plugins for Amarok
@@ -56,27 +65,6 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%package arts
-Summary:    Arts engine for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-
-%description arts
-Amarok can also use the arts engine to decode sound. This package
-enables it.
-
-
-%if "%fedora" >= "4"
-%package akode
-Summary:    AKode engine for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-
-%description akode
-Amarok can also use the akode engine to decode sound. This package
-enables it.
-%endif
-
 %if 0%{?use_xine}
 %package xine
 Summary:    Xine engine for Amarok
@@ -93,10 +81,14 @@
 %setup -q
 # remove test for GCC blacklisting
 %patch0 -p1 -b .gcc4bl
+%patch2 -p1 -b .engines-cfg
+%patch3 -p1 -b .endian
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
+# work around an improper ${kdelibsuff}
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
      --disable-debug \
 %if %{?use_xine:0}%{!?use_xine:1}
@@ -139,8 +131,22 @@
 %find_lang %{name}
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+# update icon themes if necessary
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+    # needed because amarok 1.2 puts icon in hicolor
+    # and the RPM did not update the cache on uninstall
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+/sbin/ldconfig
+# update icon themes if necessary
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+fi
 
 
 %clean
@@ -163,33 +169,28 @@
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
-
 %{_libdir}/mcop/Amarok
 %{_libdir}/mcop/amarok*
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
 %{_datadir}/doc/HTML/*/amarok
-
-
-%files visualisation
-%defattr(-,root,root)
-%{_bindir}/amarok_libvisual
-%{_bindir}/amarok_xmmswrapper2
-
-
-%files arts
-%defattr(-,root,root)
+# Arts engine
 %{_libdir}/libamarokarts*
 %{_libdir}/kde3/libamarok_artsengine_plugin.*
 %{_datadir}/services/amarok_artsengine_plugin.desktop
+# Helix engine
+%ifnarch ppc64 x86_64 s390 s390x ia64
+%{_libdir}/kde3/libamarok_helixengine_plugin.*
+%{_datadir}/services/amarok_helixengine_plugin.desktop
+%endif
 
+%exclude %{_datadir}/apps/zeroconf/_shoutcast._tcp
 
-%if "%fedora" >= "4"
-%files akode
+
+%files visualisation
 %defattr(-,root,root)
-%{_libdir}/kde3/libamarok_aKode-engine.*
-%{_datadir}/services/amarok_aKode-engine.desktop
-%endif
+%{_bindir}/amarok_libvisual
+%{_bindir}/amarok_xmmswrapper2
 
 
 %if 0%{?use_xine}
@@ -202,6 +203,66 @@
 
 
 %changelog
+* Wed Sep 21 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.2-1
+- version 1.3.2
+- remove patch 4 (applied upstream)
+
+* Sat Sep 10 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-2
+- add patch from upstream to fix alsasink in gstreamer
+- default to autoaudiosink for gstreamer
+
+* Mon Sep 05 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-1
+- version 1.3.1
+
+* Tue Aug 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-6
+- add version to obsoletes
+
+* Tue Aug 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-5
+- add missing Obsoletes.
+
+* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-4
+- fix endian declaration on ppc
+
+* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-3
+- dont build the Helix engine on arches where HelixPlayer is not built
+
+* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-2
+- disable the akode engine (disabled upstream, see Changelog)
+- merge in the Helix engine, since it does not have special Requires.
+  HelixPlayer or RealPlayer need to be installed manually (either one)
+- updated description
+
+* Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3-1
+- update to version 1.3
+- add Michel Salim's improvements:
+  - call gtk-update-icon-cache to (de-)register icons
+  - new output plugin subpackage: helix
+  - patched gst and helix plugins' default settings
+
+* Fri Jul 01 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-6
+- remove -arts subpackage, it is useless
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-6.fc5
+- remove temporary work-around from 1.2.4-2.fc4
+- add patch to fix several missing forward declarations which let
+  compilation with gcc >= 4.0.0-9 fail
+- re-enable SMP make flags
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-5.fc4
+- disable SMP make flags, since previous release failed miserably on
+  i386 while the one before it succeeded
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-4.fc4
+- set QTLIB and QTINC, so configure script does not search for Qt in
+  QTDIR/lib64 on 64-bit multilib platforms
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-3.fc4
+- try to fix build problems (#158654): always set QTDIR, always
+  buildrequire libtool-ltdl-devel, disable %%fedora conditional BR
+
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-2.fc4
+- temporarily add patch to work around Fedora Core bug 159090
+
 * Mon May 23 2005 Aurelien Bompard <gauret[AT]free.fr> 1.2.4-1
 - version 1.2.4
 - use dist tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	24 May 2005 10:56:28 -0000	1.9
+++ sources	21 Sep 2005 08:58:11 -0000	1.10
@@ -1 +1 @@
-9a3bb2c043d1db169c6a370aff439e0f  amarok-1.2.4.tar.bz2
+5988bf5a1e6ac8da41e1a8710d75b6a8  amarok-1.3.2.tar.bz2


