summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2010-05-31 20:35:33 +0200
committerRemi Collet <fedora@famillecollet.com>2010-05-31 20:35:33 +0200
commitefa27fcae78e4671c6cb2e0d9f0b29331e6728db (patch)
tree05e05440c3d3155747a7454496f2e214201b9a83
parente956c57f5aa0b98e1e4e12ae9fc28a3fb94b5a61 (diff)
fix min sqlite version to 3.6.22 (so, F-13 only)
-rw-r--r--thunderbird-enigmail.spec8
-rw-r--r--thunderbird-mozconfig1
2 files changed, 5 insertions, 4 deletions
diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index 391b7f5..9b9f23e 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -2,7 +2,7 @@
%define nss_version 3.12.3.99
%define cairo_version 1.8.8
%define freetype_version 2.1.9
-%define sqlite_version 3.6.14
+%define sqlite_version 3.6.22
%define libnotify_version 0.4
%define build_langpacks 1
%define moz_objdir objdir-tb
@@ -107,7 +107,7 @@ BuildRequires: libXrender-devel
%if 0%{?fedora} >= 10
BuildRequires: hunspell-devel
%endif
-%if 0%{?fedora} >= 11
+%if 0%{?fedora} >= 13
BuildRequires: sqlite-devel >= %{sqlite_version}
%endif
BuildRequires: startup-notification-devel
@@ -172,7 +172,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
%{__rm} -f .mozconfig
cat %{SOURCE10} \
-%if %{fedora} < 11
+%if %{fedora} < 13
| grep -v system-sqlite \
%endif
%if %{fedora} < 11
@@ -194,7 +194,7 @@ ac_add_options --disable-libnotify
%if %{fedora} >= 9
ac_add_options --enable-system-lcms
%endif
-%if %{fedora} >= 12
+%if %{fedora} >= 13
ac_add_options --enable-system-sqlite
%endif
EOF
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 3df47c0..c7334ff 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -27,6 +27,7 @@ ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-system-hunspell
ac_add_options --disable-crashreporter
+ac_add_options --disable-necko-wifi
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1