[thunderbird-lightning/el5] RHEL5 config changes from RHEL TB spec

[Orion Poplawski]

commit 17d25c8707ebca064d9b5f48f5470e305fc72a7e
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Mar 15 08:43:50 2012 -0600

    RHEL5 config changes from RHEL TB spec

 thunderbird-lightning.spec |   18 ++++++++++++++++++
 thunderbird-mozconfig      |    1 -
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index bd3c98a..a6a252d 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -1,5 +1,6 @@
 %global nspr_version 4.8.9
 %global nss_version 3.13.1
+%global cairo_version 1.6.0
 %global freetype_version 2.1.9
 %global sqlite_version 3.6.14
 %global libnotify_version 0.4
@@ -82,6 +83,11 @@ BuildRequires:  libcurl-devel
 BuildRequires:  python
 BuildRequires:  yasm
 BuildRequires:  mesa-libGL-devel
+# RHEL6 BuildRequires
+%if 0%{?rhel} > 5
+BuildRequires:  cairo-devel >= %{cairo_version}
+BuildRequires:  hunspell-devel
+%endif
 Requires:       thunderbird >= %{thunderbird_version}
 Requires:       thunderbird < %{thunderbird_next_version}
 Obsoletes:      thunderbird-lightning-wcap <= 0.8
@@ -115,6 +121,18 @@ cd ..
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 
+%if 0%{?rhel} > 5
+# RHEL 6 mozconfig changes:
+echo "ac_add_options --enable-system-hunspell" >> .mozconfig
+echo "ac_add_options --enable-libnotify" >> .mozconfig
+echo "ac_add_options --enable-startup-notification" >> .mozconfig
+%else
+# RHEL 5 mozconfig changes:
+echo "ac_add_options --disable-system-hunspell" >> .mozconfig
+echo "ac_add_options --disable-libnotify" >> .mozconfig
+echo "ac_add_options --disable-methodjit" >> .mozconfig
+%endif
+
 # s390(x) fails to start with jemalloc enabled
 %ifarch s390 s390x
 echo "ac_add_options --disable-jemalloc" >> .mozconfig
diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 4f6c62c..b1f9090 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -26,7 +26,6 @@ ac_add_options --enable-pango
 ac_add_options --disable-system-cairo
 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
 ac_add_options --disable-updater