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
commit25c5dc370ed39b85c03cea045f4b850f06dc13ec (patch)
treed7e97bcfd66fa6c57491b2b1c81035642de34127
parent80b2de39707e8ec7cd739cf6c531d394388696a2 (diff)
Fix all the wrong version tests
Of course the way these tests are written, they always evaluate to true.
-rw-r--r--thunderbird-enigmail.spec8
1 files changed, 4 insertions, 4 deletions
diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index 99f9503..5f9e8ad 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -159,14 +159,14 @@ cd ..
%{__rm} -f .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
@@ -181,7 +181,7 @@ ac_add_options --enable-chrome-format=jar
%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