diff options
| author | Georgi Georgiev <chutzimir@gmail.com> | 2011-10-12 15:22:37 +0900 |
|---|---|---|
| committer | Georgi Georgiev <chutzimir@gmail.com> | 2011-10-12 15:24:17 +0900 |
| commit | e22f3d2eef87472c525f4e795a02c0aa1140cca2 (patch) | |
| tree | 9064bd650d0245186edb28aef3731c33b2de9ec2 | |
| parent | a8942de272d2861c82033d33aa59007630b6f2ba (diff) | |
Get the thunderbird-related apps building on RHEL6
| -rw-r--r-- | thunderbird.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/thunderbird.spec b/thunderbird.spec index 6dc1dd4..fb4561c 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -64,7 +64,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 @@ -167,14 +167,14 @@ cd .. %{__rm} -f .mozconfig #{__cp} %{SOURCE10} .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 @@ -185,10 +185,10 @@ cat %{SOURCE10} \ cat <<EOF | tee -a .mozconfig ac_add_options --enable-libnotify ac_add_options --enable-system-lcms -%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 @@ -421,6 +421,9 @@ fi #=============================================================================== %changelog +* Wed Oct 12 2011 Georgi Georgiev <chutzimir@gmail.com> - 7.0.1-1 +- Make it work on RHEL + * Sat Oct 01 2011 Remi Collet <rpms@famillecollet.com> 7.0.1-1 - Thunderbird 7.0.1 |