rpms/amarok/FC-5 .cvsignore, 1.21, 1.22 amarok.spec, 1.47, 1.48 sources, 1.21, 1.22

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.4 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	14 Apr 2006 07:29:14 -0000	1.21
+++ .cvsignore	19 May 2006 21:04:47 -0000	1.22
@@ -1 +1 @@
-amarok-1.4-beta3c.tar.bz2
+amarok-1.4.0a.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- amarok.spec	14 Apr 2006 08:30:44 -0000	1.47
+++ amarok.spec	19 May 2006 21:04:47 -0000	1.48
@@ -1,15 +1,14 @@
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4
-Release:    0.12.beta3%{?dist}
+Version:    1.4.0
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
-Patch0:     amarok-1.4beta1-gst10.patch
-Patch1:     amarok-1.4-gstreamer.patch
-Patch2:     amarok-1.4-engines-cfg.patch
+Source0:    http://dl.sf.net/amarok/amarok-1.4.0a.tar.bz2
+#Patch1:     amarok-1.4-gstreamer.patch
+#Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -26,7 +25,8 @@
 #BuildRequires:  akode-devel
 BuildRequires:  libifp-devel, libusb-devel
 %if "%fedora" >= "5"
-BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
+# gstreamer disabled in version 1.4 final (not ready yet)
+#BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
 BuildRequires:  libgpod-devel
 %else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
@@ -35,6 +35,9 @@
 BuildRequires:  HelixPlayer
 %endif
 
+# Lyrics scripts
+Requires:  ruby
+
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -69,11 +72,11 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-beta3c
+%setup -q
 # Make Gstreamer a sufficient engine as well (only engine available on x86_64)
-%patch1 -p1 -b .gstreamer
+#%patch1 -p1 -b .gstreamer
 # Gstreamer default sink should be autoaudiosink
-%patch2 -p1 -b .engines-cfg
+#%patch2 -p1 -b .engines-cfg
 
 
 %build
@@ -168,24 +171,26 @@
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
-%{_datadir}/services/amarok_vfat-mediadevice.desktop
-%{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
-%{_libdir}/kde3/libamarok_vfat-mediadevice.*
-%{_libdir}/kde3/libamarok_ipod-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
-# Gstreamer engine
+# IPod support
+%{_datadir}/services/amarok_ipod-mediadevice.desktop
+%{_libdir}/kde3/libamarok_ipod-mediadevice.*
+# VFAT device support
+%{_datadir}/services/amarok_generic-mediadevice.desktop
+%{_libdir}/kde3/libamarok_generic-mediadevice.*
+# Gstreamer engine - disabled in 1.4 final
 %if "%fedora" >= "5"
-%{_datadir}/services/amarok_gst10engine_plugin.desktop
-%{_libdir}/kde3/libamarok_gst10engine_plugin.*
+#%{_datadir}/services/amarok_gst10engine_plugin.desktop
+#%{_libdir}/kde3/libamarok_gst10engine_plugin.*
 %else
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
@@ -200,6 +205,7 @@
 %endif
 
 
+
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
@@ -208,6 +214,12 @@
 
 
 %changelog
+* Mon May 15 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-1
+- version 1.4 final
+
+* Mon May 01 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.13.rc1
+- rc1
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.12.beta3
 - add patch to make Gstreamer sufficient to build (only engine available
   on x86_64


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	14 Apr 2006 07:29:14 -0000	1.21
+++ sources	19 May 2006 21:04:47 -0000	1.22
@@ -1 +1 @@
-b92433b46005f0b2fc31e0ce0bf4cb3a  amarok-1.4-beta3c.tar.bz2
+3ceffe6465290eef618861cdb81b420a  amarok-1.4.0a.tar.bz2