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

[Aurelien Bompard <abompard@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 1b8ac8d9f4c3bcd70f02fa580e40b2c98816c06c
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2006-05-21T13:17:47+00:00
Stats  : +317/-173 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/1b8ac8d9f4c3bcd70f02fa580e40b2c98816c06c?branch=epel10.2

Log:
version 1.4 final

---
diff --git a/.cvsignore b/.cvsignore
index 1174bd1..ca237b6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 amarok-1.4.0a.tar.bz2
+gst10-1.4beta3.tar.gz

diff --git a/amarok-1.3.6-libtunepimp040.patch b/amarok-1.3.6-libtunepimp040.patch
deleted file mode 100644
index e38d5e8..0000000
--- a/amarok-1.3.6-libtunepimp040.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- amarok-1.3.6/amarok/src/ktrm.cpp.tp 2005-11-07 16:19:18.000000000 -0600
-+++ amarok-1.3.6/amarok/src/ktrm.cpp    2005-11-17 13:09:35.000000000 -0600
-@@ -42,7 +42,7 @@
- 
- extern "C"
- {
--    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
-+    static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
- }
- 
- /**
-@@ -66,7 +66,8 @@
-         int id;
- 
-         if(!m_fileMap.contains(lookup->file())) {
--            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
-+            // Not sure if 3rd field should be 0 or 1, guessing 1 -- Rex
-+            id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()),1);
-             m_fileMap.insert(lookup->file(), id);
-         }
-         else {
-@@ -121,7 +122,6 @@
-         tp_SetAutoSaveThreshold(m_pimp, -1);
-         tp_SetMoveFiles(m_pimp, false);
-         tp_SetRenameFiles(m_pimp, false);
--        tp_SetUseUTF8(m_pimp, true);
-         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
- 
-         if(KProtocolManager::useProxy()) {
-@@ -245,13 +245,13 @@
-  * Callback fuction for TunePimp lookup events.
-  */
- 
--static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId)
-+static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId, TPFileStatus status)
- {
-     if(type != tpFileChanged)
-         return;
- 
-     track_t track = tp_GetTrack(pimp, fileId);
--    TPFileStatus status = tr_GetStatus(track);
-+    status = tr_GetStatus(track);
- 
-     switch(status) {
-     case eRecognized:
-@@ -556,10 +556,10 @@
-                 KTRMResult result;
- 
-                 result.d->title = QString::fromUtf8(tracks[i]->name);
--                result.d->artist = QString::fromUtf8(tracks[i]->artist->name);
--                result.d->album = QString::fromUtf8(tracks[i]->album->name);
-+                result.d->artist = QString::fromUtf8(tracks[i]->artist.name);
-+                result.d->album = QString::fromUtf8(tracks[i]->album.name);
-                 result.d->track = tracks[i]->trackNum;
--                result.d->year = tracks[i]->album->releaseYear;
-+                result.d->year = tracks[i]->album.releaseYear;
-                 result.d->relevance =
-                     4 * stringSimilarity(strList,result.d->title) +
-                     2 * stringSimilarity(strList,result.d->artist) +
-

diff --git a/amarok-1.4-gstreamer.patch b/amarok-1.4-gstreamer.patch
index 67c00d0..a9cec0f 100644
--- a/amarok-1.4-gstreamer.patch
+++ b/amarok-1.4-gstreamer.patch
@@ -1,6 +1,222 @@
---- ./configure.gstreamer	2006-04-09 23:08:39.000000000 +0200
-+++ ./configure	2006-04-14 10:23:09.000000000 +0200
-@@ -37922,7 +37922,7 @@
+--- ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop.gstreamer	2006-05-21 14:31:55.000000000 +0200
++++ ./amarok/src/engine/gst10/amarok_gst10engine_plugin.desktop	2006-05-21 14:32:05.000000000 +0200
+@@ -74,6 +74,6 @@
+ X-KDE-amaroK-email=markey@web.de
+ X-KDE-amaroK-rank=254
+ X-KDE-amaroK-version=1
+-X-KDE-amaroK-framework-version=20
++X-KDE-amaroK-framework-version=23
+ 
+ 
+--- ./amarok/src/engine/Makefile.in.gstreamer	2006-05-14 22:05:27.000000000 +0200
++++ ./amarok/src/engine/Makefile.in	2006-05-21 14:12:47.000000000 +0200
+@@ -365,9 +365,6 @@
+ 
+ 
+ 
+-#if with_gst10
+-#    GST10_ENGINE_SUBDIR = gst10
+-#endif
+ @with_nmm_TRUE@NMM_ENGINE_SUBDIR = nmm
+ 
+ @with_xine_TRUE@XINE_ENGINE_SUBDIR = xine
+@@ -388,7 +385,8 @@
+     void \
+     $(XINE_ENGINE_SUBDIR) \
+     $(NMM_ENGINE_SUBDIR) \
+-    $(HELIX_ENGINE_SUBDIR)
++    $(HELIX_ENGINE_SUBDIR) \
++    gst10
+ 
+ subdir = amarok/src/engine
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+--- ./configure.gstreamer	2006-05-14 22:04:55.000000000 +0200
++++ ./configure	2006-05-21 14:11:29.000000000 +0200
+@@ -32730,41 +32730,148 @@
+ # BEGIN GSTREAMER-0.10 CHECK
+ ###############################################################################
+ 
+-#AC_ARG_WITH(gstreamer10,
+-#    AC_HELP_STRING([--with-gstreamer10],[build amaroK with GStreamer 0.10-engine]),
+-#    [build_gstreamer10=$withval],
+-#    [build_gstreamer10=no]
+-#)
+-#
+-#if test "$build_gstreamer10" != "no"; then
+-#    if test "$PKGCONFIGFOUND" = "yes" ; then
+-#        # check for GStreamer
+-#        dnl Now we're ready to ask for gstreamer libs and cflags
+-#        dnl And we can also ask for the right version of gstreamer
+-#        have_gst10=no
+-#
+-#        GST10_MAJORMINOR=0.10
+-#        GST10_REQ=0.10.0
+-#
+-#        PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
+-#            have_gst10=yes,have_gst10=no)
+-#
+-#        dnl Give error if we don't have gstreamer
+-#        if test "x$have_gst10" = "xno"; then
+-#            LIB_GST10=""
+-#            CFLAGS_GST10=""
+-#        else
+-#            LIB_GST10=$GST10_LIBS
+-#            CFLAGS_GST10=$GST10_CFLAGS
+-#            AC_SUBST(LIB_GST10)
+-#            AC_SUBST(CFLAGS_GST10)
+-#            AC_SUBST(GST10_MAJORMINOR)
+-#            AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
+-#        fi
+-#    fi
+-#fi
+-#
+-#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
++# Check whether --with-gstreamer10 or --without-gstreamer10 was given.
++if test "${with_gstreamer10+set}" = set; then
++  withval="$with_gstreamer10"
++  build_gstreamer10=$withval
++else
++  build_gstreamer10=no
++
++fi;
++
++if test "$build_gstreamer10" != "no"; then
++    if test "$PKGCONFIGFOUND" = "yes" ; then
++        # check for GStreamer
++                        have_gst10=no
++
++        GST10_MAJORMINOR=0.10
++        GST10_REQ=0.10.0
++
++
++  succeeded=no
++
++  if test -z "$PKG_CONFIG"; then
++    # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
++if test -n "$PKG_CONFIG"; then
++  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  fi
++
++  if test "$PKG_CONFIG" = "no" ; then
++     echo "*** The pkg-config script could not be found. Make sure it is"
++     echo "*** in your path, or set the PKG_CONFIG environment variable"
++     echo "*** to the full path to pkg-config."
++     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++  else
++     PKG_CONFIG_MIN_VERSION=0.9.0
++     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++        echo "$as_me:$LINENO: checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" >&5
++echo $ECHO_N "checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR... $ECHO_C" >&6
++
++        if $PKG_CONFIG --exists "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" ; then
++            echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++            succeeded=yes
++
++            echo "$as_me:$LINENO: checking GST10_CFLAGS" >&5
++echo $ECHO_N "checking GST10_CFLAGS... $ECHO_C" >&6
++            GST10_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
++            echo "$as_me:$LINENO: result: $GST10_CFLAGS" >&5
++echo "${ECHO_T}$GST10_CFLAGS" >&6
++
++            echo "$as_me:$LINENO: checking GST10_LIBS" >&5
++echo $ECHO_N "checking GST10_LIBS... $ECHO_C" >&6
++            GST10_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
++            echo "$as_me:$LINENO: result: $GST10_LIBS" >&5
++echo "${ECHO_T}$GST10_LIBS" >&6
++        else
++            GST10_CFLAGS=""
++            GST10_LIBS=""
++            ## If we have a custom action on failure, don't print errors, but
++            ## do set a variable so people can do so.
++            GST10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
++
++        fi
++
++
++
++     else
++        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++        echo "*** See http://www.freedesktop.org/software/pkgconfig"
++     fi
++  fi
++
++  if test $succeeded = yes; then
++     have_gst10=yes
++  else
++     have_gst10=no
++  fi
++
++
++                if test "x$have_gst10" = "xno"; then
++            LIB_GST10=""
++            CFLAGS_GST10=""
++        else
++            LIB_GST10=$GST10_LIBS
++            CFLAGS_GST10=$GST10_CFLAGS
++
++
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GSTREAMER10 1
++_ACEOF
++
++        fi
++    fi
++fi
++
++
++
++if test x$have_gst10 = xyes; then
++  with_gst10_TRUE=
++  with_gst10_FALSE='#'
++else
++  with_gst10_TRUE='#'
++  with_gst10_FALSE=
++fi
++
+ 
+ ###############################################################################
+ # END GSTREAMER-0.10 CHECK
+@@ -37885,7 +37992,7 @@
  # BEGIN DO_NOT_COMPILE CHECK
  ###############################################################################
  
@@ -9,7 +225,44 @@
  
      DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
      no_engine=yes
-@@ -40316,7 +40316,7 @@
+@@ -38007,6 +38114,12 @@
+           ac_config_files="$ac_config_files amarok/src/engine/void/Makefile"
+ 
+           ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile"
++          
++          ac_config_files="$ac_config_files amarok/src/engine/gst10/Makefile"
++
++          ac_config_files="$ac_config_files amarok/src/engine/gst10/config/Makefile"
++
++          ac_config_files="$ac_config_files amarok/src/engine/gst10/equalizer/Makefile"
+ 
+           ac_config_files="$ac_config_files amarok/src/images/Makefile"
+ 
+@@ -38913,6 +39026,9 @@
+   "amarok/src/engine/nmm/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;;
+   "amarok/src/engine/void/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;;
+   "amarok/src/engine/xine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;;
++  "amarok/src/engine/gst10/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/Makefile" ;;
++  "amarok/src/engine/gst10/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/config/Makefile" ;;
++  "amarok/src/engine/gst10/equalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/equalizer/Makefile" ;;
+   "amarok/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;;
+   "amarok/src/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;;
+   "amarok/src/konquisidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;;
+@@ -39314,6 +39430,13 @@
+ s,@taglib_includes@,$taglib_includes,;t t
+ s,@taglib_libs@,$taglib_libs,;t t
+ s,@RUBY@,$RUBY,;t t
++s,@GST10_CFLAGS@,$GST10_CFLAGS,;t t
++s,@GST10_LIBS@,$GST10_LIBS,;t t
++s,@LIB_GST10@,$LIB_GST10,;t t
++s,@CFLAGS_GST10@,$CFLAGS_GST10,;t t
++s,@GST10_MAJORMINOR@,$GST10_MAJORMINOR,;t t
++s,@with_gst10_TRUE@,$with_gst10_TRUE,;t t
++s,@with_gst10_FALSE@,$with_gst10_FALSE,;t t
+ s,@XINE_CONFIG@,$XINE_CONFIG,;t t
+ s,@with_xine_TRUE@,$with_xine_TRUE,;t t
+ s,@with_xine_FALSE@,$with_xine_FALSE,;t t
+@@ -40259,7 +40382,7 @@
      echo " =================================="
      echo " ="
      echo " = No suitable multimedia framework was detected. You need to install at least"
@@ -18,3 +271,29 @@
      echo " ="
  fi
  
+@@ -40290,9 +40413,9 @@
+ #        echo " =   - aKode-engine"
+ #    fi
+ 
+-#    if test x$have_gst10 != xyes; then
+-#        echo " =   - GStreamer0.10-engine"
+-#    fi
++    if test x$have_gst10 != xyes; then
++        echo " =   - GStreamer0.10-engine"
++    fi
+ 
+     if test x$build_xine != xyes; then
+         echo " =   - xine-engine"
+@@ -40359,9 +40482,9 @@
+ #        echo " =   + aKode-engine"
+ #    fi
+ 
+-#    if test x$have_gst10 = xyes; then
+-#        echo " =   + GStreamer0.10-engine"
+-#    fi
++    if test x$have_gst10 = xyes; then
++        echo " =   + GStreamer0.10-engine"
++    fi
+ 
+     if test x$build_xine = xyes; then
+         echo " =   + xine-engine"

diff --git a/amarok-1.4beta1-gst10.patch b/amarok-1.4beta1-gst10.patch
deleted file mode 100644
index 7c9cf22..0000000
--- a/amarok-1.4beta1-gst10.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- ./amarok/src/engine/gst10/Makefile.in.gst10	2006-02-21 23:58:21.000000000 +0100
-+++ ./amarok/src/engine/gst10/Makefile.in	2006-02-22 00:00:18.000000000 +0100
-@@ -64,7 +64,7 @@
- am__DEPENDENCIES_1 =
- libamarok_gst10engine_plugin_la_DEPENDENCIES =  \
- 	$(top_builddir)/amarok/src/engine/libengine.la \
--	$(top_builddir)/amarok/src/engine/gst/config/libgstconfig.la \
-+	$(top_builddir)/amarok/src/engine/gst10/config/libgstconfig.la \
- 	$(top_builddir)/amarok/src/plugin/libplugin.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_libamarok_gst10engine_plugin_la_OBJECTS = gstconfigdialog.lo \
-@@ -482,7 +482,7 @@
- 
- INCLUDES = \
-     -I$(top_srcdir)/amarok/src/engine \
--    -I$(top_srcdir)/amarok/src/engine/gst/config \
-+    -I$(top_srcdir)/amarok/src/engine/gst10/config \
-     -I$(top_srcdir)/amarok/src/plugin \
-     -I$(top_srcdir)/amarok/src \
-     $(CFLAGS_GST10) \
-@@ -490,7 +490,7 @@
- 
- libamarok_gst10engine_plugin_la_LIBADD = \
-     $(top_builddir)/amarok/src/engine/libengine.la \
--    $(top_builddir)/amarok/src/engine/gst/config/libgstconfig.la \
-+    $(top_builddir)/amarok/src/engine/gst10/config/libgstconfig.la \
-     $(top_builddir)/amarok/src/plugin/libplugin.la \
-     $(LIB_KFILE) \
-     $(LIB_KDECORE)
---- ./configure.gst10	2006-02-12 18:50:17.000000000 +0100
-+++ ./configure	2006-02-21 23:41:47.000000000 +0100
-@@ -33551,10 +33551,12 @@
- ### gst/audio/audio.h, which is in gstreamer-plugins (at least for me)
- amarok_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $CFLAGS_GST10"
--if test "${ac_cv_header_gst_audio_audio_h+set}" = set; then
-+# Don't use cache
-+if test "${ac_cv_header_gst_audio_audio_h+set}XXX" = set; then
-   echo "$as_me:$LINENO: checking for gst/audio/audio.h" >&5
- echo $ECHO_N "checking for gst/audio/audio.h... $ECHO_C" >&6
--if test "${ac_cv_header_gst_audio_audio_h+set}" = set; then
-+# Don't use cache
-+if test "${ac_cv_header_gst_audio_audio_h+set}XXX" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_gst_audio_audio_h" >&5
-@@ -33678,7 +33680,8 @@
- esac
- echo "$as_me:$LINENO: checking for gst/audio/audio.h" >&5
- echo $ECHO_N "checking for gst/audio/audio.h... $ECHO_C" >&6
--if test "${ac_cv_header_gst_audio_audio_h+set}" = set; then
-+# Don't use cache
-+if test "${ac_cv_header_gst_audio_audio_h+set}XXX" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_gst_audio_audio_h=$ac_header_preproc
-@@ -41326,7 +41329,7 @@
- 
- fi
- 
--if test x$have_gst = xno; then
-+if test x$have_gst = xno -a x$have_gst10 = xno; then
-     echo " =========================="
-     echo " ===  amaroK - WARNING  ========================================================"
-     echo " =========================="
-@@ -41447,6 +41450,10 @@
-         echo " =   - GStreamer-engine"
-     fi
- 
-+    if test x$have_gst10 != xyes; then
-+        echo " =   - GStreamer-engine 0.10"
-+    fi
-+
-     if test x$build_xine != xyes; then
-         echo " =   - xine-engine"
-     fi
-@@ -41520,6 +41527,9 @@
-         echo " =   + GStreamer-engine"
-     fi
- 
-+    if test x$have_gst10 = xyes; then
-+        echo " =   + GStreamer-engine 0.10"
-+    fi
-     if test x$build_xine = xyes; then
-         echo " =   + xine-engine"
-     fi

diff --git a/amarok.spec b/amarok.spec
index c5e4ab0..3dc4768 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -7,8 +7,10 @@ Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 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
+# Bring back the gstreamer engine from 1.4 beta3
+Source1:    gst10-1.4beta3.tar.gz
+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
@@ -22,15 +24,15 @@ BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
-#BuildRequires:  akode-devel
 BuildRequires:  libifp-devel, libusb-devel
-%if "%fedora" >= "5"
-# 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
+# Akode engine
+#BuildRequires:  akode-devel
+# Gstreamer engine
+%ifarch ppc64 x86_64 s390 s390x ia64
+BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
 %endif
+# Helix engine
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -63,6 +65,8 @@ or RealPlayer
 Summary:    Visualisation plugins for Amarok
 Group:      Applications/Multimedia
 Requires:   %{name} = %{version}
+# RPM CVS supports "Suggests":
+#Requires(hint): libvisual-plugins
 
 %description visualisation
 Amarok can use visualisation plugins from different origins.
@@ -72,11 +76,15 @@ use any of xmms' visualisation plugins with Amarok.
 
 
 %prep
-%setup -q
-# Make Gstreamer a sufficient engine as well (only engine available on x86_64)
-#%patch1 -p1 -b .gstreamer
+%setup -q -a 1
+%ifarch ppc64 x86_64 s390 s390x ia64
+# Bring Gstreamer back and make it a sufficient engine
+# (only engine available if Helix in unavailable)
+mv gst10 amarok/src/engine/
+%patch1 -p1 -b .gstreamer
 # Gstreamer default sink should be autoaudiosink
-#%patch2 -p1 -b .engines-cfg
+%patch2 -p1 -b .engines-cfg
+%endif
 
 
 %build
@@ -169,12 +177,8 @@ rm -fr $RPM_BUILD_ROOT
 %exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
-%{_datadir}/services/amarok_void-engine_plugin.desktop
-%{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_libdir}/kde3/libamarok_void-engine_plugin.*
-%{_libdir}/kde3/libamarok_ifp-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
@@ -187,13 +191,16 @@ rm -fr $RPM_BUILD_ROOT
 # 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.*
-%else
-%{_datadir}/services/amarok_gstengine_plugin.desktop
-%{_libdir}/kde3/libamarok_gstengine_plugin.*
+# iRiver device support
+%{_datadir}/services/amarok_ifp-mediadevice.desktop
+%{_libdir}/kde3/libamarok_ifp-mediadevice.*
+# Void engine (noop)
+%{_datadir}/services/amarok_void-engine_plugin.desktop
+%{_libdir}/kde3/libamarok_void-engine_plugin.*
+# Gstreamer engine
+%ifarch ppc64 x86_64 s390 s390x ia64
+%{_datadir}/services/amarok_gst10engine_plugin.desktop
+%{_libdir}/kde3/libamarok_gst10engine_plugin.*
 %endif
 # Akode engine - disabled in beta3
 #%{_datadir}/services/amarok_aKode-engine.desktop
@@ -216,6 +223,8 @@ rm -fr $RPM_BUILD_ROOT
 %changelog
 * Mon May 15 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-1
 - version 1.4 final
+- gstreamer engine has been disabled, bring it back in SOURCE1
+  where Helix is unavailable (only engine available)
 
 * Mon May 01 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.13.rc1
 - rc1

diff --git a/sources b/sources
index 2ff6716..ca7ea24 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 3ceffe6465290eef618861cdb81b420a  amarok-1.4.0a.tar.bz2
+78f329116089047704f32158e204ef4f  gst10-1.4beta3.tar.gz