[rpms/amarok] epel10: - fix gstreamer 0.10 detection

[rpms/amarok] epel10: - fix gstreamer 0.10 detection

[Aurelien Bompard]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : 72e8c3a3eda968ab430dac3e0202f931f993c8ac
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2006-02-21T11:09:32+00:00
Stats  : +64/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/72e8c3a3eda968ab430dac3e0202f931f993c8ac?branch=epel10

Log:
- fix gstreamer 0.10 detection

---
diff --git a/amarok-1.4beta1-gst10.patch b/amarok-1.4beta1-gst10.patch
new file mode 100644
index 0000000..be7f7cf
--- /dev/null
+++ b/amarok-1.4beta1-gst10.patch
@@ -0,0 +1,57 @@
+--- ./configure.gst	2006-02-20 06:29:07.000000000 -0500
++++ ./configure	2006-02-20 07:48:48.000000000 -0500
+@@ -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 e229464..0e4cf52 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -7,12 +7,13 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.2.beta1%{?dist}
+Release:    0.3.beta1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.4-beta1.tar.bz2
+Patch0:     amarok-1.4beta1-gst10.patch
 #Patch0:     amarok-1.3.4-helix-libs.patch
 #Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
@@ -103,6 +104,8 @@ This package adds the patented/non-free plugins for Amarok:
 #%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
 
 
 %build
@@ -252,6 +255,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 20 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.3.beta1
+- fix gstreamer 0.10 detection
+
 * Fri Feb 17 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.1.beta1
 - fix gstreamer dependency