rpms/amarok/FC-5 amarok-1.4-helix.patch, 1.1, 1.2 amarok.spec, 1.44, 1.45

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16792

Modified Files:
	amarok-1.4-helix.patch amarok.spec 
Log Message:
make amarok build with gstreamer only (helix is unavailable on x86_64)

amarok-1.4-helix.patch:

Index: amarok-1.4-helix.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok-1.4-helix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.4-helix.patch	14 Mar 2006 08:38:52 -0000	1.1
+++ amarok-1.4-helix.patch	21 Mar 2006 23:08:40 -0000	1.2
@@ -1,11 +1,20 @@
 --- ./configure.helix	2006-03-05 20:28:13.000000000 +0100
-+++ ./configure	2006-03-13 23:04:01.000000000 +0100
++++ ./configure	2006-03-22 00:04:48.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
++if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
  
      DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
      no_engine=yes
+@@ -40594,7 +40594,7 @@
+     echo " =================================="
+     echo " ="
+     echo " = No suitable multimedia framework was detected. You need to install at least"
+-    echo " = the Xine or Helix framework as detailed in the amaroK README."
++    echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README."
+     echo " ="
+ fi
+ 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- amarok.spec	14 Mar 2006 08:38:52 -0000	1.44
+++ amarok.spec	21 Mar 2006 23:08:40 -0000	1.45
@@ -7,7 +7,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.8.beta2%{?dist}
+Release:    0.9.beta2%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -154,7 +154,7 @@
 # Head until the blank line:
 perl -pi -e '/^$/ && exit' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-desktop-file-install  --vendor fedora \
+desktop-file-install  --vendor "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
         --delete-original \
         --add-category Application \
@@ -257,6 +257,9 @@
 
 
 %changelog
+* Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.9.beta2
+- make amarok build even with gstreamer only
+
 * Sun Mar 05 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.8.beta2
 - version 1.4 beta2