From 80b2de39707e8ec7cd739cf6c531d394388696a2 Mon Sep 17 00:00:00 2001
From: Georgi Georgiev <chutzimir@gmail.com>
Date: Wed, 12 Oct 2011 15:22:37 +0900
Subject: Get the thunderbird-related apps building on RHEL6

---
 thunderbird-enigmail.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index a08955d..99f9503 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -77,7 +77,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
 %endif
-%if %{fedora} >= 15
+%if 0%{?fedora} >= 15
 # Library requirements (cairo-tee >= 1.10)
 BuildRequires:  cairo-devel >= %{cairo_version}
 %endif
@@ -159,14 +159,14 @@ cd ..
 
 %{__rm} -f .mozconfig
 cat %{SOURCE10} 		\
-%if %{fedora} < 15
+%if 0%{?fedora} < 15 || 0%{?rhel} <= 6
   | grep -v system-sqlite 	\
 %endif
-%if %{fedora} < 14
+%if 0%{?fedora} < 14 || 0%{?rhel} <= 6
   | grep -v system-nss 		\
   | grep -v system-nspr 	\
 %endif
-%if %{fedora} < 15
+%if 0%{?fedora} < 15 || 0%{?rhel} <= 6
   | grep -v enable-system-cairo    \
 %endif
 %ifarch %{ix86} x86_64
@@ -178,10 +178,10 @@ cat <<EOF | tee -a .mozconfig
 ac_add_options --enable-libnotify
 ac_add_options --enable-system-lcms
 ac_add_options --enable-chrome-format=jar
-%if %{fedora} >= 15
+%if 0%{?fedora} >= 15
 ac_add_options --enable-system-sqlite
 %endif
-%if %{fedora} < 14
+%if 0%{?fedora} < 14 || 0%{?rhel} <= 6
 ac_add_options --disable-libjpeg-turbo
 %endif
 EOF
@@ -284,6 +284,9 @@ cd %{tarballdir}
 #===============================================================================
 
 %changelog
+* Wed Oct 12 2011 Georgi Georgiev <chutzimir@gmail.com> - 1.3.2-2
+- Make it work on RHEL
+
 * Sat Oct 01 2011 Remi Collet <remi@fedoraproject.org> 1.3.2-2
 - Enigmail 1.3.2 for Thunderbird 7.0.1
 - fix extension version
-- 
cgit