rpms/amarok/devel .cvsignore, 1.25, 1.26 amarok.spec, 1.55, 1.56 sources, 1.25, 1.26 needs.rebuild, 1.1, NONE

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19980/devel

Modified Files:
	.cvsignore amarok.spec sources 
Removed Files:
	needs.rebuild 
Log Message:
- update to 1.4.2
- remove needs.update file



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	19 Jul 2006 09:06:15 -0000	1.25
+++ .cvsignore	30 Aug 2006 14:16:07 -0000	1.26
@@ -1,2 +1 @@
-amarok-1.4.1.tar.bz2
-amarok-1.4.1-beta1-gst10-2.tar.bz2
+amarok-1.4.2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- amarok.spec	19 Jul 2006 09:06:15 -0000	1.55
+++ amarok.spec	30 Aug 2006 14:16:07 -0000	1.56
@@ -4,20 +4,26 @@
 %endif
 %{?_with_gst10: %define gst10 1}
 
+# The amarok dev (Ian Monroe) prefers to make amarok excludearched on x86_64
+# than to include the unfinished gstreamer engine (private mail following
+# http://amarok.kde.org/blog/archives/210-And-How-Open-Source-Sucks-Sometimes.html )
+%define gst10 0
+
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.1
-Release:    3%{?dist}
+Version:    1.4.2
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4.1.tar.bz2
+Source0:    http://mirrors.ibiblio.org/pub/mirrors/kde/stable/amarok/1.4.2/src/amarok-1.4.2.tar.bz2
 # Bring back the gstreamer engine from the beta
-Source1:    amarok-1.4.1-beta1-gst10-2.tar.bz2
-Patch1:     amarok-1.4.1-gstreamer.patch
-Patch2:     amarok-1.4-engines-cfg.patch
+#Source1:    amarok-1.4.1-beta1-gst10-2.tar.bz2
+#Patch1:     amarok-1.4.1-gstreamer.patch
+# Gstreamer default sink should be autoaudiosink
+#Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -25,7 +31,7 @@
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  libGL
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
-BuildRequires:  libvisual-devel >= 0.4.0, SDL-devel, gtk+-devel
+BuildRequires:  libvisual-devel >= 0.4.0, SDL-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
@@ -61,6 +67,10 @@
 Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
 Provides:  amarok-devel = %{version}-%{release}
 
+# On those archs, there is no engine 
+# (Helix is unavailable, gstreamer is in beta, xine is encumbered)
+ExcludeArch: ppc64 x86_64 s390 s390x ia64
+
 
 %description
 Amarok is a KDE multimedia player with:
@@ -91,13 +101,13 @@
 
 
 %prep
-%setup -q -a 1
+%setup -q 
 %if "%{gst10}" == "1"
+#%%setup -q -a 1
 # Bring Gstreamer back and make it a sufficient engine
 # (only engine available if Helix in unavailable)
 mv gst10 amarok/src/engine/
 %patch1 -p1 -b .gstreamer
-# Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 touch --reference aclocal.m4 amarok/src/engine/gst10/Makefile.in
 touch --reference aclocal.m4 amarok/src/engine/gst10/config/Makefile.in
@@ -204,14 +214,29 @@
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/services/lastfm.protocol
-# IPod support
+%{_datadir}/services/amarokitpc.protocol
+%{_datadir}/services/amaroklastfm.protocol
+%{_datadir}/services/amarokpcast.protocol
+# DAAP
+%{_bindir}/amarok_daapserver.rb
+%{_libdir}/kde3/libamarok_daap-mediadevice.*
+%{_datadir}/services/amarok_daap-mediadevice.desktop
+# Mass-storage
+%{_datadir}/services/amarok_massstorage-device.desktop
+%{_libdir}/kde3/libamarok_massstorage-device.*
+# NFS
+%{_datadir}/services/amarok_nfs-device.desktop
+%{_libdir}/kde3/libamarok_nfs-device.*
+# SMB
+%{_datadir}/services/amarok_smb-device.desktop
+%{_libdir}/kde3/libamarok_smb-device.*
+# IPod
 %{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_libdir}/kde3/libamarok_ipod-mediadevice.*
-# VFAT device support
+# VFAT
 %{_datadir}/services/amarok_generic-mediadevice.desktop
 %{_libdir}/kde3/libamarok_generic-mediadevice.*
-# iRiver device support
+# iRiver
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
 # Creative Zen
@@ -245,6 +270,10 @@
 
 
 %changelog
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.2-1
+- update to 1.4.2
+- don't build on x86_64 (requested by the amarok devs)
+
 * Wed Jul 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.1-3
 - fix the gstreamer engine (wrong X-KDE-Amarok-framework-version)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	19 Jul 2006 09:06:15 -0000	1.25
+++ sources	30 Aug 2006 14:16:07 -0000	1.26
@@ -1,2 +1 @@
-4ed6e766541c4227d1d8c8eb93d0b891  amarok-1.4.1.tar.bz2
-284b8d0e1e94ab24322aa24f67a7cee1  amarok-1.4.1-beta1-gst10-2.tar.bz2
+a1e5aac4294eb049021d1e2889c0d214  amarok-1.4.2.tar.bz2


--- needs.rebuild DELETED ---