summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorgi Georgiev <chutzimir@gmail.com>2011-10-29 12:55:49 +0900
committerGeorgi Georgiev <chutzimir@gmail.com>2011-10-29 13:00:02 +0900
commitd17609f7ea513a65d57e5eb266bfdad2b0ebffbb (patch)
treea03d763e9a08e6a2690208ae4ae316e222d5882e
parentbfffaeaf63daf1a80abd55604af7093e3b59778f (diff)
Fix all the wrong version tests
Of course the way these tests are written, they always evaluate to true.
-rw-r--r--thunderbird-lightning.spec8
1 files 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