rpms/amarok/devel amarok-1.4-engines-cfg.patch, NONE, 1.1 amarok-1.4-helix.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 amarok.spec, 1.43, 1.44 sources, 1.19, 1.20 amarok-1.3-engines-cfg.patch, 1.3, NONE amarok-1.3.4-helix-libs.patch, 1.1, NONE

Aurelien Bompard (abompard) fedora-extras-commits at redhat.com
Tue Mar 14 08:38:53 UTC 2006


Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Added Files:
	amarok-1.4-engines-cfg.patch amarok-1.4-helix.patch 
Removed Files:
	amarok-1.3-engines-cfg.patch amarok-1.3.4-helix-libs.patch 
Log Message:
version 1.4beta2

amarok-1.4-engines-cfg.patch:

--- NEW FILE amarok-1.4-engines-cfg.patch ---
diff -Nur amarok-1.3-orig/amarok/src/engine/gst10/config/gstconfig.kcfg amarok-1.3/amarok/src/engine/gst10/config/gstconfig.kcfg
--- amarok-1.3-orig/amarok/src/engine/gst10/config/gstconfig.kcfg 2005-08-14 17:53:18.000000000 -0500
+++ amarok-1.3/amarok/src/engine/gst10/config/gstconfig.kcfg  2005-08-16 12:15:31.000000000 -0500
@@ -10,7 +10,7 @@
         <entry key="Sound Output" type="String">
             <label>Sound output method to use</label>
             <whatsthis>Select the sound output plugin ("sink"). Their availability depends on the system configuration.</whatsthis>
-            <default>osssink</default>
+            <default>autoaudiosink</default>
         </entry>
         <entry key="Use Custom Sound Device" type="Bool">
             <label>Do not use the autodetected audiosink sound device</label>

amarok-1.4-helix.patch:

--- NEW FILE amarok-1.4-helix.patch ---
--- ./configure.helix	2006-03-05 20:28:13.000000000 +0100
+++ ./configure	2006-03-13 23:04:01.000000000 +0100
@@ -38181,7 +38181,7 @@
 # BEGIN DO_NOT_COMPILE CHECK
 ###############################################################################
 
-if test x$build_xine != xyes -a x$build_helix != xno; then
+if test x$build_xine = xno -a x$build_helix = xno; then
 
     DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
     no_engine=yes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	17 Feb 2006 11:00:41 -0000	1.19
+++ .cvsignore	14 Mar 2006 08:38:52 -0000	1.20
@@ -1 +1 @@
-amarok-1.4-beta1.tar.bz2
+amarok-1.4-beta2.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- amarok.spec	22 Feb 2006 09:22:26 -0000	1.43
+++ amarok.spec	14 Mar 2006 08:38:52 -0000	1.44
@@ -7,16 +7,16 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.7.beta1%{?dist}
+Release:    0.8.beta2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4-beta1.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.4-beta2.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-#Patch0:     amarok-1.3.4-helix-libs.patch
+Patch1:     amarok-1.4-helix.patch
 #Patch1:     amarok-1.3.6-libtunepimp040.patch
-Patch2:     amarok-1.3-engines-cfg.patch
+Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -47,7 +47,6 @@
 BuildRequires:  faad2-devel
 %endif
 
-Requires:   kdemultimedia >= 6:3.2
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -97,15 +96,15 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-beta1
+%setup -q -n %{name}-%{version}-beta2
 # Discover the helix libs
-#%patch0 -p1 -b .helix-libs
+%patch1 -p1 -b .helix
 # Use libtunepimp 0.4.0 (api changed)
 #%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 # Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present
-%patch0 -p1 -b .gst10
+#%patch0 -p1 -b .gst10
 
 
 %build
@@ -222,8 +221,6 @@
 %{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %{_datadir}/apps/profiles/amarok.profile.xml
-%{_libdir}/mcop/Amarok
-%{_libdir}/mcop/amarok*
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
 # Gstreamer engine
@@ -237,10 +234,6 @@
 # Akode engine
 %{_datadir}/services/amarok_aKode-engine.desktop
 %{_libdir}/kde3/libamarok_aKode-engine.*
-# 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.*
@@ -264,6 +257,9 @@
 
 
 %changelog
+* Sun Mar 05 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.8.beta2
+- version 1.4 beta2
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.7.beta1
 - disable build of Helix engine on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Feb 2006 11:00:41 -0000	1.19
+++ sources	14 Mar 2006 08:38:52 -0000	1.20
@@ -1 +1 @@
-78dfa2c8c65cb7fe1cf26aaa6cc193e8  amarok-1.4-beta1.tar.bz2
+0c7e2a5e8ea2d73d8e73b986090cfc37  amarok-1.4-beta2.tar.bz2


--- amarok-1.3-engines-cfg.patch DELETED ---


--- amarok-1.3.4-helix-libs.patch DELETED ---




More information about the fedora-extras-commits mailing list