packages: iceweasel/iceweasel.spec - exact version dep on sqlite3 version t...

glen glen at pld-linux.org
Mon Dec 7 09:44:14 CET 2009


Author: glen                         Date: Mon Dec  7 08:44:14 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- exact version dep on sqlite3 version that was built with if without xulrunner

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.78 packages/iceweasel/iceweasel.spec:1.79
--- packages/iceweasel/iceweasel.spec:1.78	Mon Dec  7 09:42:44 2009
+++ packages/iceweasel/iceweasel.spec	Mon Dec  7 09:44:09 2009
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - cleanup deps: --without xulrunner
 #
 # Conditional build:
 %bcond_with	tests		# enable tests (whatever they check)
@@ -20,6 +22,11 @@
 # convert firefox release number to platform version: 3.5.x -> 1.9.1.x
 %define		xulrunner_ver	%(v=%{version}; echo 1.9.1.${v#3.5.})
 
+%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:	Iceweasel web browser
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
@@ -92,7 +99,7 @@
 Requires:	myspell-common
 Requires:	nspr >= 1:4.8
 Requires:	nss >= 1:3.12.3
-Requires:	sqlite3 >= 3.6.19
+Requires:	sqlite3 >= %{sqlite_build_version}
 %endif
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
@@ -521,6 +528,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2009/12/07 08:44:09  glen
+- exact version dep on sqlite3 version that was built with if without xulrunner
+
 Revision 1.78  2009/12/07 08:42:44  glen
 - there is only xul
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.78&r2=1.79&f=u



More information about the pld-cvs-commit mailing list