rpms/amarok/FC-6 .cvsignore, 1.27, 1.28 amarok.spec, 1.63, 1.64 sources, 1.27, 1.28

[Aurelien Bompard (abompard)]

Author: abompard

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	13 Sep 2006 13:27:07 -0000	1.27
+++ .cvsignore	31 Oct 2006 11:01:42 -0000	1.28
@@ -1 +1 @@
-amarok-1.4.3.tar.bz2
+amarok-1.4.4.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/amarok.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- amarok.spec	7 Oct 2006 09:01:54 -0000	1.63
+++ amarok.spec	31 Oct 2006 11:01:42 -0000	1.64
@@ -1,18 +1,16 @@
-# 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 )
+# TODO:
+# Rio Karma support : libkarma
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.4.3
-Release:    6%{?dist}
+Version:    1.4.4
+Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/1.4.3/src/amarok-1.4.3.tar.bz2
-Patch0:     amarok-1.4.3-playlist_encoding.patch
+Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -26,6 +24,7 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  xine-lib-devel
 # Detected by configure
 BuildRequires:  ruby, ruby-devel
 BuildRequires:  libifp-devel, libusb-devel
@@ -43,8 +42,6 @@
 %endif
 
 Requires:  ruby
-# Helix is the only available engine
-Requires:  HelixPlayer
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -52,10 +49,6 @@
 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:
@@ -87,7 +80,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .playlist_encoding
 
 
 
@@ -104,7 +96,6 @@
      --with-ifp \
      --with-libgpod \
      --without-mp4v2 \
-     --without-xine \
 %ifnarch ppc64 x86_64 s390 s390x ia64
      --with-helix=%{_libdir}/helix \
 %endif
@@ -179,7 +170,6 @@
 %{_bindir}/amarokcollectionscanner
 %{_bindir}/amarok_proxy.rb
 %{_datadir}/apps/%{name}
-%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/servicetypes/*.desktop
@@ -193,6 +183,7 @@
 %{_datadir}/services/amarokitpc.protocol
 %{_datadir}/services/amaroklastfm.protocol
 %{_datadir}/services/amarokpcast.protocol
+%{_libdir}/ruby_lib/*
 # DAAP
 %{_bindir}/amarok_daapserver.rb
 %{_libdir}/kde3/libamarok_daap-mediadevice.*
@@ -224,6 +215,9 @@
 # Void engine (noop)
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
+# Xine engine
+%{_datadir}/services/amarok_xine-engine.desktop
+%{_libdir}/kde3/libamarok_xine-engine.*
 ## Gstreamer engine
 #%{_datadir}/services/amarok_gst10engine_plugin.desktop
 #%{_libdir}/kde3/libamarok_gst10engine_plugin.*
@@ -244,6 +238,10 @@
 
 
 %changelog
+* Fri Oct 27 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.4-1
+- version 1.4.4
+- enable xine support since xine is now in Fedora
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4.3-6
 - rebuild for new libtunepimp
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-6/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 Sep 2006 13:27:07 -0000	1.27
+++ sources	31 Oct 2006 11:01:42 -0000	1.28
@@ -1 +1 @@
-b0b4f8952ad23705c70815d50fd0af52  amarok-1.4.3.tar.bz2
+56a9aec42088c338b81252f8e0651781  amarok-1.4.4.tar.bz2