SPECS: amarok.spec - postgresql bcond, some other fixes and cleanu...

[djurban]

Author: djurban                      Date: Mon Oct 17 21:23:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- postgresql bcond, some other fixes and cleanups fixing helix

---- Files affected:
SPECS:
   amarok.spec (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.79 SPECS/amarok.spec:1.80
--- SPECS/amarok.spec:1.79	Sun Oct 16 21:26:42 2005
+++ SPECS/amarok.spec	Mon Oct 17 23:23:24 2005
@@ -3,7 +3,6 @@
 #	* postgresql support alongside mysql
 #	* NMM audio backend support (fix build - propably some BRs)
 #	* make descriptions less useless
-#	* HelixPlayer engine (fix build - propably some BRs)
 #	* track http://websvn.kde.org/trunk/extragear/multimedia/amarok/TODO?rev=470324&r1=470292&r2=470324
 #
 # Conditional builds:
@@ -17,6 +16,7 @@
 %bcond_with	helix		# enable HelixPlayer engine
 %bcond_with	nmm             # enable NMM audio backend
 %bcond_with	mysql		# enable mysql support
+%bcond_with	pgsql		# enables postgresql support
 %bcond_with	akode		# enable aKode engine (too buggy/incomplete)
 %bcond_with	altlyrics	# use alternative lyrics provider
 Summary:	A KDE audio player
@@ -38,7 +38,7 @@
 BuildRequires:	arts-qt-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_gstreamer:BuildRequires:	gstreamer-plugins-devel >= 0.8.1}
+%{?with_gstreamer:BuildRequires:	gstreamer-plugins-devel >= 0.8.6}
 BuildRequires:	kdebase-devel
 %{?with_akode:BuildRequires:	kdemultimedia-akode}
 BuildRequires:	kdemultimedia-devel >= 9:3.1.93
@@ -46,10 +46,12 @@
 BuildRequires:	libmusicbrainz-devel
 BuildRequires:	libvisual-devel >= 0.2.0
 %{?with_mysql:BuildRequires:		mysql-devel}
+%{?with_pgsql:BuildRequires:		libpqxx-devel}
 BuildRequires:	pcre-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
+%{?with_helix:BuildRequires:helix-core}
 %{?!with_included_sqlite:BuildRequires:	sqlite3-devel}
 BuildRequires:	taglib-devel >= 1.4
 %{?with_xine:BuildRequires:		xine-lib-devel >= 2:1.0-0.rc5.0}
@@ -191,14 +193,15 @@
 
 %configure \
 	--disable-rpath \
-	%{!?with_arts:--without-arts} \
-	%{?with_mas:--with-mas} \
-	%{!?with_xine:--without-xine} \
-	%{!?with_gstreamer:--without-gstreamer} \
-	%{!?with_akode:--without-akode} \
-	%{?with_helix:--with-helix} \
-	%{?with_nmm:--with-nmm} \
-	%{?with_mysql:--with-mysql} \
+	--with%{!?with_arts:out}-arts \
+	--with%{!?with_mas:out}-mas \
+	--with%{!?with_xine:out}-xine \
+	--with%{!?with_gstreamer:out}-gstreamer \
+	--with%{!?with_akode:out}-akode \
+	--with%{!?with_helix:out}-helix \
+	--with%{!?with_nmm:out}-nmm \
+	--%{?with_mysql:en}%{!?with_mysql:dis}able-mysql \
+	--%{?with_mysql:en}%{!?with_mysql:dis}nable-postgresql \
 	--disable-final \
 	--with-qt-libraries=%{_libdir} \
 	--with%{!?with_included_sqlite:out}-included-sqlite
@@ -385,6 +388,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2005/10/17 21:23:24  djurban
+- postgresql bcond, some other fixes and cleanups fixing helix
+
 Revision 1.79  2005/10/16 19:26:42  glen
 - cosmetic
 
================================================================

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