From d17609f7ea513a65d57e5eb266bfdad2b0ebffbb Mon Sep 17 00:00:00 2001 From: Georgi Georgiev Date: Sat, 29 Oct 2011 12:55:49 +0900 Subject: Fix all the wrong version tests Of course the way these tests are written, they always evaluate to true. --- thunderbird-lightning.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec index 0dc511f..09b7e61 100644 --- a/thunderbird-lightning.spec +++ b/thunderbird-lightning.spec @@ -140,14 +140,14 @@ cd .. %{__rm} -f .mozconfig #{__cp} %{SOURCE10} .mozconfig cat %{SOURCE10} \ -%if 0%{?fedora} < 15 || 0%{?rhel} <= 6 +%if 0%{?fedora} < 15 && 0%{?rhel} <= 6 | grep -v system-sqlite \ %endif -%if 0%{?fedora} < 14 || 0%{?rhel} <= 6 +%if 0%{?fedora} < 14 && 0%{?rhel} <= 6 | grep -v system-nss \ | grep -v system-nspr \ %endif -%if 0%{?fedora} < 15 || 0%{?rhel} <= 6 +%if 0%{?fedora} < 15 && 0%{?rhel} <= 6 | grep -v enable-system-cairo \ %endif %ifarch %{ix86} x86_64 @@ -161,7 +161,7 @@ ac_add_options --enable-system-lcms %if 0%{?fedora} >= 15 ac_add_options --enable-system-sqlite %endif -%if 0%{?fedora} < 14 || 0%{?rhel} <= 6 +%if 0%{?fedora} < 14 && 0%{?rhel} <= 6 ac_add_options --disable-libjpeg-turbo %endif EOF -- cgit