[xulrunner/f15] Removed system sqlite for f15 (sqlite is too old)
Jan Horak
xhorak at fedoraproject.org
Tue Dec 20 11:10:57 UTC 2011
commit c6743363182bf6c353291e18d27032bb29965f98
Author: Jan Horak <jhorak at redhat.com>
Date: Tue Dec 20 12:10:54 2011 +0100
Removed system sqlite for f15 (sqlite is too old)
xulrunner.spec | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index fba5db2..824b50c 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -3,7 +3,7 @@
%global nss_version 3.13.1
%global cairo_version 1.10.2
%global freetype_version 2.1.9
-%global sqlite_version 3.7.4
+%global sqlite_version 3.7.7.1
%global libnotify_version 0.7.0
# gecko_dir_ver should be set to the version in our directory names
@@ -24,6 +24,12 @@
%global enable_mozilla_crashreporter 0
%endif
+%if 0%{?fedora} <= 15
+%define system_sqlite 0
+%else
+%define system_sqlite 1
+%endif
+
# The actual sqlite version (see #480989):
%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
@@ -105,7 +111,9 @@ BuildRequires: freetype-devel >= %{freetype_version}
BuildRequires: libXt-devel
BuildRequires: libXrender-devel
BuildRequires: hunspell-devel
+%if %{?system_sqlite}
BuildRequires: sqlite-devel >= %{sqlite_version}
+%endif
BuildRequires: startup-notification-devel
BuildRequires: alsa-lib-devel
BuildRequires: libnotify-devel >= %{libnotify_version}
@@ -117,7 +125,9 @@ BuildRequires: libvpx-devel
Requires: mozilla-filesystem
Requires: nspr >= %{nspr_version}
Requires: nss >= %{nss_version}
+%if %{?system_sqlite}
Requires: sqlite >= %{sqlite_build_version}
+%endif
Provides: gecko-libs = %{gecko_verrel}
Provides: gecko-libs%{?_isa} = %{gecko_verrel}
@@ -155,7 +165,9 @@ Requires: freetype-devel >= %{freetype_version}
Requires: libXt-devel
Requires: libXrender-devel
Requires: hunspell-devel
+%if %{?system_sqlite}
Requires: sqlite-devel
+%endif
Requires: startup-notification-devel
Requires: alsa-lib-devel
Requires: libnotify-devel
@@ -230,6 +242,11 @@ echo "ac_add_options --disable-polyic" >> .mozconfig
echo "ac_add_options --disable-tracejit" >> .mozconfig
%endif
+%if %{?system_sqlite}
+echo "ac_add_options --enable-system-sqlite" >> .mozconfig
+%else
+echo "ac_add_options --disable-system-sqlite" >> .mozconfig
+%endif
#---------------------------------------------------------------------
%build
More information about the scm-commits
mailing list