packages: icedove/icedove.spec - build with system sqlite; rel 2 - nss/nspr...

[glen]

Author: glen                         Date: Sun Apr  4 20:11:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build with system sqlite; rel 2
- nss/nspr forcibly removal works as well for now

---- Files affected:
packages/icedove:
   icedove.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.67 packages/icedove/icedove.spec:1.68
--- packages/icedove/icedove.spec:1.67	Sun Apr  4 21:44:10 2010
+++ packages/icedove/icedove.spec	Sun Apr  4 22:11:53 2010
@@ -2,7 +2,6 @@
 # TODO:
 # - separate spec for enigmail
 # - fix icedove (building) and installing nss/nspr libs!
-# - build and use system sqlite3 library!
 # - build with system mozldap
 #
 # Conditional builds
@@ -21,11 +20,16 @@
 
 %define		enigmail_ver		1.0.1
 
+%if %{without xulrunner}
+# The actual sqlite version (see RHBZ#480989):
+%define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
+%endif
+
 Summary:	Icedove - email client
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
 Version:	3.0.4
-Release:	1.2
+Release:	2
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
@@ -60,6 +64,7 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	nspr-devel >= 1:4.8
 BuildRequires:	nss-devel >= 1:3.12.0
+BuildRequires:	sqlite3-devel
 BuildRequires:	pango-devel >= 1:1.1.0
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
@@ -68,9 +73,13 @@
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	zip
+%if %{with xulrunner}
+%else
 Requires:	myspell-common
+Requires:	sqlite3 >= %{sqlite_build_version}
 Requires:	nspr >= 1:4.6.1
 Requires:	nss >= 1:3.11.3
+%endif
 Obsoletes:	mozilla-thunderbird
 Obsoletes:	mozilla-thunderbird-dictionary-en-US
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -241,6 +250,7 @@
 ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
 ac_add_options --enable-xft
 ac_add_options --enable-application=mail
 ac_add_options --enable-default-toolkit=cairo-gtk2
@@ -336,8 +346,6 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
 # nspr
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
-# sqlite3
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite3.so
 # mozldap
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
 
@@ -423,6 +431,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2010/04/04 20:11:53  glen
+- build with system sqlite; rel 2
+- nss/nspr forcibly removal works as well for now
+
 Revision 1.67  2010/04/04 19:44:10  glen
 - forcibly remove nss/nspr/sqlite/mozldap libraries
 - list only shared libs we want to package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.67&r2=1.68&f=u