SPECS: amarok.spec - added helixplayer-morearchs patch (fixes buil...

[qboosh]

Author: qboosh                       Date: Wed Dec 14 13:16:33 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added helixplayer-morearchs patch (fixes build on alpha and possibly others)
- use configure hack to stop BRing helixplayer

---- Files affected:
SPECS:
   amarok.spec (1.99 -> 1.100) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.99 SPECS/amarok.spec:1.100
--- SPECS/amarok.spec:1.99	Tue Dec 13 21:57:43 2005
+++ SPECS/amarok.spec	Wed Dec 14 14:16:27 2005
@@ -32,6 +32,7 @@
 Patch0:		kde-common-gcc4.patch
 Patch1:		%{name}-lyricsurl.patch
 Patch2:		%{name}-libtunepimp-0.4.0.patch
+Patch3:		%{name}-helixplayer-morearchs.patch
 URL:		http://amarok.kde.org/
 #BuildRequires:	kdebindings-kjsembed-devel
 #BuildRequires:	unsermake >= 040511
@@ -53,8 +54,7 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
-%{?with_helix:BuildRequires: helix-core}
-%{?!with_included_sqlite:BuildRequires:	sqlite3-devel}
+%{!?with_included_sqlite:BuildRequires:	sqlite3-devel}
 BuildRequires:	taglib-devel >= 1.4
 %{?with_xine:BuildRequires:		xine-lib-devel >= 2:1.0-0.rc5.0}
 %{?with_xmms:BuildRequires:		xmms-devel}
@@ -191,6 +191,7 @@
 %patch0 -p1
 %{?with_altlyrics:%patch1 -p1}
 %patch2 -p1
+%patch3 -p1
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
 	amarok/src/amarok.desktop \
 
@@ -204,7 +205,10 @@
 
 %{__make} -f admin/Makefile.common cvs
 
+# hack: passing something other than "no" or "yes" to --with-helix allows
+# us to pass HELIX_LIBS
 %configure \
+	HELIX_LIBS=%{_libdir}/helixplayer \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	--disable-rpath \
 	--with%{!?with_arts:out}-arts \
@@ -212,7 +216,7 @@
 	--with%{!?with_xine:out}-xine \
 	--with%{!?with_gstreamer:out}-gstreamer \
 	--with%{!?with_akode:out}-akode \
-	--with%{!?with_helix:out}-helix \
+	--with%{!?with_helix:out}-helix%{?with_helix:=usegivenpath} \
 	--with%{!?with_nmm:out}-nmm \
 	--%{?with_mysql:en}%{!?with_mysql:dis}able-mysql \
 	--%{?with_mysql:en}%{!?with_mysql:dis}able-postgresql \
@@ -411,6 +415,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100  2005/12/14 13:16:27  qboosh
+- added helixplayer-morearchs patch (fixes build on alpha and possibly others)
+- use configure hack to stop BRing helixplayer
+
 Revision 1.99  2005/12/13 20:57:43  paszczus
 - build with helix by default (helixplayer is in ac-ready now)
 - release 1 (this is the most stable version of amarok that i ever use)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.99&r2=1.100&f=u