[mozilla-adblockplus/epel7] Fix some more conditionals for EPEL 7

Russell William Golden niveusluna at fedoraproject.org
Mon Jul 7 16:14:03 UTC 2014


commit b4b91ecd32bd731ee20c290eb75dd3bcb6cef0d2
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Mon Jul 7 11:14:13 2014 -0500

    Fix some more conditionals for EPEL 7

 mozilla-adblockplus.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/mozilla-adblockplus.spec b/mozilla-adblockplus.spec
index 2cbb302..7c889f6 100644
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@ -53,14 +53,14 @@ element hiding over the original Adblock extension.
 
 %if 0%{?fedora} < 18
 %patch1 -p 1
-%elseif 0%{?rhel}
+%elseif 0%{?rhel} < 7
 %patch1 -p 1
 %endif
 
 %build
 mkdir -p _build
 
-%if 0%{?rhel}
+%if 0%{?rhel} < 7
 PYTHONPATH=/usr/lib/python2.6/site-packages/Jinja2-2.6-py2.6.egg \
     python build.py build --release -b %{release} _build/%{filename}
 %else
@@ -109,8 +109,9 @@ rm -rf %{buildroot}
 %{thunderbird_inst_dir}
 
 %changelog
-* Thu Jun 26 2014 Russell Golden <niveusluna at niveusluna.org> - 2.6.3-1
+* Mon Jul 07 2014 Russell Golden <niveusluna at niveusluna.org> - 2.6.3-1
 - Many performance improvements
+- Update spec file for EPEL 7
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild


More information about the scm-commits mailing list