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

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

[Aurelien Bompard]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : 264c08a2c07c2b7b950262cedfeae824b94ed527
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2006-02-21T23:52:04+00:00
Stats  : +46/-7 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/264c08a2c07c2b7b950262cedfeae824b94ed527?branch=epel10

Log:
- fix gstreamer 0.10 compilation

---
diff --git a/amarok-1.4beta1-gst10.patch b/amarok-1.4beta1-gst10.patch
index be7f7cf..7c9cf22 100644
--- a/amarok-1.4beta1-gst10.patch
+++ b/amarok-1.4beta1-gst10.patch
@@ -1,5 +1,34 @@
---- ./configure.gst	2006-02-20 06:29:07.000000000 -0500
-+++ ./configure	2006-02-20 07:48:48.000000000 -0500
+--- ./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"

diff --git a/amarok.spec b/amarok.spec
index 0e4cf52..266857e 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -7,7 +7,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.3.beta1%{?dist}
+Release:    0.4.beta1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -208,16 +208,12 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/apps/%{name}
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
-%{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
-%{_datadir}/services/amarok_aKode-engine.desktop
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_datadir}/services/amarok_vfat-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_libdir}/kde3/libamarok_gstengine_plugin.*
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
-%{_libdir}/kde3/libamarok_aKode-engine.*
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
 %{_libdir}/kde3/libamarok_vfat-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
@@ -228,6 +224,17 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/mcop/amarok*
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/*.kcfg
+# Gstreamer engine
+%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.*
+%endif
+# Akode engine
+%{_datadir}/services/amarok_aKode-engine.desktop
+%{_libdir}/kde3/libamarok_aKode-engine.*
 # Arts engine
 %{_libdir}/libamarokarts*
 %{_libdir}/kde3/libamarok_artsengine_plugin.*
@@ -255,6 +262,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.4.beta1
+- fix gstramer 0.10 detection again
+
 * Mon Feb 20 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.3.beta1
 - fix gstreamer 0.10 detection