[mozilla-adblockplus] Change spec file to be universal (hopefully) so different spec files are not needed for RHEL6 and Fe

[Russell William Golden]

commit 4103fadf8c79577c8dd8c7bdac361b3f14ea8455
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Mon Jul 2 12:41:46 2012 -0500

    Change spec file to be universal (hopefully) so different spec
    files are not needed for RHEL6 and Fedora.
    Fix buildNum patch.

 mozilla-adblockplus-1.3.8-buildNum.patch |   12 ------------
 mozilla-adblockplus.spec                 |   18 +++++++++++++++---
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/mozilla-adblockplus.spec b/mozilla-adblockplus.spec
index 72dfa17..3fd8ce4 100644
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@ -15,7 +15,7 @@
 
 Name:           mozilla-adblockplus
 Version:        2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Adblocking extension for Mozilla Firefox, Thunderbird, and Seamonkey
 
 Group:          Applications/Internet
@@ -25,13 +25,17 @@ URL:            http://adblockplus.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}-%{version}-buildtools.tar.bz2
 Source99:       %{name}-tarball.sh
-Patch0:         mozilla-adblockplus-1.3.8-buildNum.patch
+Patch0:         mozilla-adblockplus-2.1-buildNum.patch
 Patch1:		disable-safeads.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
+%if 0%{?rhel}
+BuildRequires:  zip, python, sed, python-jinja2-26
+%else
 BuildRequires:  zip, python, sed, python-jinja2
+%endif
 Requires:       mozilla-filesystem
 
 
@@ -52,7 +56,13 @@ element hiding over the original Adblock extension.
 
 %build
 mkdir -p _build
+
+%if 0%{?rhel}
+PYTHONPATH=/usr/lib/python2.6/site-packages/Jinja2-2.6-py2.6.egg \
+    python build.py build --release -b %{release} _build/%{name}-%{version}-%{release}.xpi
+%else
 python build.py build --release -b %{release} _build/%{name}-%{version}-%{release}.xpi
+%endif
 
 
 %install
@@ -97,7 +107,9 @@ rm -rf %{buildroot}
 %{thunderbird_inst_dir}
 
 %changelog
-* Sat Jun 30 2012 Russell Golden <niveusluna at niveusluna.org> - 2.1-1
+* Mon Jul 02 2012 Russell Golden <niveusluna at niveusluna.org> - 2.1-2
+- update to upstream 2.1
+- add changelog
 
 * Fri Jan 20 2012 Russell Golden <niveusluna at niveusluna.org> - 2.0.3-3
 - build release build, not debug build