rpms/amarok/FC-4 .cvsignore, 1.18, 1.19 amarok.spec, 1.37, 1.38 sources, 1.18, 1.19

Aurelien Bompard (abompard) fedora-extras-commits at redhat.com
Sat Apr 15 08:29:35 UTC 2006


Author: abompard

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	22 Jan 2006 09:07:05 -0000	1.18
+++ .cvsignore	15 Apr 2006 08:29:35 -0000	1.19
@@ -1 +1 @@
-amarok-1.3.8.tar.bz2
+amarok-1.3.9.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- amarok.spec	22 Jan 2006 09:07:06 -0000	1.37
+++ amarok.spec	15 Apr 2006 08:29:35 -0000	1.38
@@ -1,20 +1,13 @@
-# Rebuild switch: 
-#  --with xine    Enables xine engine
-#
-
-%{?_with_xine: %define use_xine 1}
-
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.8
+Version:    1.3.9
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.8.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.9.tar.bz2
 #Patch0:     amarok-1.3.4-helix-libs.patch
-Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,20 +21,11 @@
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
-%if "%fedora" >= "5"
-BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
-%else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
-%endif
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_xine}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
-BuildRequires:  libmad-devel
-%endif
-
 Requires:   kdemultimedia >= 6:3.2
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -74,24 +58,10 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_xine}
-%package xine
-Summary:    Xine engine for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-
-%description xine
-Amarok can also use the xine engine to decode sound. This package
-enables it
-%endif
-
-
 %prep
 %setup -q
 # Discover the helix libs
 #%patch0 -p1 -b .helix-libs
-# Use libtunepimp 0.4.0 (api changed)
-%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -103,11 +73,11 @@
 %configure \
      --disable-debug \
      --disable-rpath \
-     --with-helix=%{_libdir}/helix \
      --enable-mysql \
      --enable-postgresql \
-%if %{?use_xine:0}%{!?use_xine:1}
-     --without-xine
+     --without-xine \
+%ifnarch ppc64 x86_64 s390 s390x ia64
+     --with-helix=%{_libdir}/helix \
 %endif
 #     --enable-final \
 #     --with-nmm \
@@ -210,16 +180,12 @@
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_xine}
-%files xine
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_xine-engine.*
-%{_datadir}/services/amarok_xine-engine.desktop
-#%{_datadir}/services/amarok_xine-engine_plugin.desktop
-%endif
-
-
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.9-1
+- version 1.3.9
+- drop nonfree bits
+- drop patch 1 (upstream updated)
+
 * Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.8-1
 - version 1.3.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jan 2006 09:07:23 -0000	1.18
+++ sources	15 Apr 2006 08:29:35 -0000	1.19
@@ -1 +1 @@
-fd1ee0509568e5f9f7d0aeb9af094786  amarok-1.3.8.tar.bz2
+fb4cb3dafd3d15657b78e24c33abcf76  amarok-1.3.9.tar.bz2




More information about the fedora-extras-commits mailing list