SPECS: amarok.spec - added bcond for sqlite, so we can use the inc...

prism prism at pld-linux.org
Thu Oct 13 23:59:32 CEST 2005


Author: prism                        Date: Thu Oct 13 21:59:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bcond for sqlite, so we can use the included lib version, which
  makes the creation of new collection possible (PLD version is too new)
- release 2

---- Files affected:
SPECS:
   amarok.spec (1.76 -> 1.77) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.76 SPECS/amarok.spec:1.77
--- SPECS/amarok.spec:1.76	Thu Oct 13 21:41:06 2005
+++ SPECS/amarok.spec	Thu Oct 13 23:59:27 2005
@@ -13,6 +13,7 @@
 %bcond_without	xine		# disable xine engine
 %bcond_without	xmms 		# disable xmms wrapping
 %bcond_without	zeroconf	# disable support for zeroconf
+%bcond_with included_sqlite # use included sqlite, not the distro's
 %bcond_with	helix		# enable HelixPlayer engine
 %bcond_with	nmm             # enable NMM audio backend
 %bcond_with	mysql		# enable mysql support
@@ -22,7 +23,7 @@
 Summary(pl):	Odtwarzacz audio dla KDE
 Name:		amarok
 Version:	1.3.3
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications/Multimedia
 Source0:	http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
@@ -49,7 +50,7 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
-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}
@@ -200,7 +201,7 @@
 	%{?with_mysql:--with-mysql} \
 	--disable-final \
 	--with-qt-libraries=%{_libdir} \
-	--without-included-sqlite
+	--with%{?!with_included_sqlite:out}-included-sqlite
 
 %{__make}
 
@@ -384,6 +385,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.77  2005/10/13 21:59:27  prism
+- added bcond for sqlite, so we can use the included lib version, which
+  makes the creation of new collection possible (PLD version is too new)
+- release 2
+
 Revision 1.76  2005/10/13 19:41:06  pluto
 - more todo.
 
================================================================

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




More information about the pld-cvs-commit mailing list