rpms/amarok/devel amarok-1.4beta1-gst10.patch, 1.1, 1.2 amarok.spec, 1.39, 1.40

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	amarok-1.4beta1-gst10.patch amarok.spec 
Log Message:
- fix gstreamer 0.10 compilation

amarok-1.4beta1-gst10.patch:

Index: amarok-1.4beta1-gst10.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.4beta1-gst10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.4beta1-gst10.patch	21 Feb 2006 11:09:32 -0000	1.1
+++ amarok-1.4beta1-gst10.patch	21 Feb 2006 23:52:04 -0000	1.2
@@ -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"


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- amarok.spec	21 Feb 2006 11:09:32 -0000	1.39
+++ amarok.spec	21 Feb 2006 23:52:04 -0000	1.40
@@ -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 @@
 %{_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 @@
 %{_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 @@
 
 
 %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