[rpms/amarok] epel10.2: version 1.4beta2

[rpms/amarok] epel10.2: version 1.4beta2

[Aurelien Bompard]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : ee79d49690846e4e5ebbffeb39209493ae20fdb1
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2006-03-14T08:38:52+00:00
Stats  : +35/-43 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/ee79d49690846e4e5ebbffeb39209493ae20fdb1?branch=epel10.2

Log:
version 1.4beta2

---
diff --git a/.cvsignore b/.cvsignore
index b9b9781..cb44e4f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.4-beta1.tar.bz2
+amarok-1.4-beta2.tar.bz2

diff --git a/amarok-1.3-engines-cfg.patch b/amarok-1.3-engines-cfg.patch
deleted file mode 100644
index c79baf9..0000000
--- a/amarok-1.3-engines-cfg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur amarok-1.3-orig/amarok/src/engine/gst/config/gstconfig.kcfg amarok-1.3/amarok/src/engine/gst/config/gstconfig.kcfg
---- amarok-1.3-orig/amarok/src/engine/gst/config/gstconfig.kcfg 2005-08-14 17:53:18.000000000 -0500
-+++ amarok-1.3/amarok/src/engine/gst/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>

diff --git a/amarok-1.3.4-helix-libs.patch b/amarok-1.3.4-helix-libs.patch
deleted file mode 100644
index 6e329f5..0000000
--- a/amarok-1.3.4-helix-libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./configure.helix-libs	2005-10-24 00:09:21.000000000 +0200
-+++ ./configure	2005-10-24 10:00:13.000000000 +0200
-@@ -33598,7 +33598,11 @@
-             build_helix=$HELIX_LIBS
-         fi
-     elif test "$HXPLAY" != "" -a -x "$HXPLAY"; then
--        HELIX_LIBS=`dirname $(readlink $HXPLAY)`
-+        if test -h "$HXPLAY"; then
-+            HELIX_LIBS=`dirname $(readlink $HXPLAY)`
-+        else
-+            HELIX_LIBS=$withval
-+        fi
-         if test -e "$HELIX_LIBS/common/clntcore.so"; then
-             echo "found HelixPlayer"
-             build_helix=$HELIX_LIBS

diff --git a/amarok-1.4-engines-cfg.patch b/amarok-1.4-engines-cfg.patch
new file mode 100644
index 0000000..78b4ef2
--- /dev/null
+++ b/amarok-1.4-engines-cfg.patch
@@ -0,0 +1,12 @@
+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>

diff --git a/amarok-1.4-helix.patch b/amarok-1.4-helix.patch
new file mode 100644
index 0000000..ea11401
--- /dev/null
+++ b/amarok-1.4-helix.patch
@@ -0,0 +1,11 @@
+--- ./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

diff --git a/amarok.spec b/amarok.spec
index 2903c49..2022509 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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:  libmad-devel
 BuildRequires:  faad2-devel
 %endif
 
-Requires:   kdemultimedia >= 6:3.2
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -97,15 +96,15 @@ This package adds the patented/non-free plugins for Amarok:
 
 
 %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 @@ rm -fr $RPM_BUILD_ROOT
 %{_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 @@ rm -fr $RPM_BUILD_ROOT
 # 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 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %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
 

diff --git a/sources b/sources
index c413004..53160be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78dfa2c8c65cb7fe1cf26aaa6cc193e8  amarok-1.4-beta1.tar.bz2
+0c7e2a5e8ea2d73d8e73b986090cfc37  amarok-1.4-beta2.tar.bz2