[mozilla-adblockplus/el6] update to upstream 2.1.1
Russell William Golden
niveusluna at fedoraproject.org
Sat Jul 7 20:30:56 UTC 2012
commit 3c55623494c2faea4b7c025749281e958baa94cc
Author: Russell Golden <niveusluna at niveusluna.org>
Date: Sat Jul 7 15:29:52 2012 -0500
update to upstream 2.1.1
disable-safeads.patch | 8 ++--
mozilla-adblockplus-1.3.8-buildNum.patch | 12 -----
mozilla-adblockplus.spec | 71 ++++++++++++++++++++++-------
sources | 4 +-
4 files changed, 60 insertions(+), 35 deletions(-)
---
diff --git a/disable-safeads.patch b/disable-safeads.patch
index dc97526..9e4fc1f 100644
--- a/disable-safeads.patch
+++ b/disable-safeads.patch
@@ -1,7 +1,7 @@
-diff -up mozilla-adblockplus-2.0.3/defaults/preferences/adblockplus.js.old mozilla-adblockplus-2.0.3/defaults/preferences/adblockplus.js
---- mozilla-adblockplus-2.0.3/defaults/preferences/adblockplus.js.old 2012-01-05 10:26:14.590944737 -0600
-+++ mozilla-adblockplus-2.0.3/defaults/preferences/adblockplus.js 2012-01-05 10:26:27.667588231 -0600
-@@ -23,7 +23,7 @@ pref("extensions.adblockplus.subscriptio
+diff -up mozilla-adblockplus-2.1/defaults/prefs.js.orig mozilla-adblockplus-2.1/defaults/prefs.js
+--- mozilla-adblockplus-2.1/defaults/prefs.js.orig 2012-07-02 13:01:55.441969452 -0500
++++ mozilla-adblockplus-2.1/defaults/prefs.js 2012-07-02 13:02:27.168969136 -0500
+@@ -22,7 +22,7 @@ pref("extensions.adblockplus.subscriptio
pref("extensions.adblockplus.subscriptions_listurl", "https://adblockplus.org/subscriptions2.xml");
pref("extensions.adblockplus.subscriptions_fallbackurl", "https://adblockplus.org/getSubscription?version=%VERSION%&url=%SUBSCRIPTION%&downloadURL=%URL%&error=%ERROR%&channelStatus=%CHANNELSTATUS%&responseStatus=%RESPONSESTATUS%");
pref("extensions.adblockplus.subscriptions_fallbackerrors", 5);
diff --git a/mozilla-adblockplus.spec b/mozilla-adblockplus.spec
index ee46161..d9be522 100644
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@ -14,8 +14,8 @@
%define debug_package %{nil}
Name: mozilla-adblockplus
-Version: 2.0.3
-Release: 4%{?dist}
+Version: 2.1.1
+Release: 1%{?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,8 +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
@@ -61,19 +70,43 @@ rm -rf %{buildroot}
cd _build
unzip %{name}-%{version}-%{release}.xpi
install -dm 755 %{buildroot}%{inst_dir}
-install -pm 644 chrome.manifest icon.png icon64.png install.rdf %{buildroot}%{inst_dir}
-install -Dpm 644 ./components/Initializer.js \
- %{buildroot}%{inst_dir}/components/Initializer.js
-install -Dpm 644 defaults/patterns.ini \
- %{buildroot}%{inst_dir}/defaults/patterns.ini
-install -Dpm 644 defaults/preferences/adblockplus.js \
- %{buildroot}%{inst_dir}/defaults/preferences/adblockplus.js
-install -Dpm 644 chrome/adblockplus.jar \
- %{buildroot}%{inst_dir}/chrome/adblockplus.jar
-install -dm 755 %{buildroot}%{inst_dir}/modules
-for f in modules/*; do
+install -pm 644 chrome.manifest icon.png icon64.png install.rdf bootstrap.js %{buildroot}%{inst_dir}
+
+install -Dpm 644 chrome/content/errors.html %{bulidroot}%{inst_dir}/chrome/content/errors.html
+install -Dpm 644 chrome/content/objtabs.css %{bulidroot}%{inst_dir}/chrome/content/objtabs.css
+
+install -dm 755 %{buildroot}/%{inst_dir}/chrome/content/ui
+for f in chrome/content/ui/*; do
+install -Dpm 644 ${f} \
+ %{buildroot}%{inst_dir}/${f}
+done
+
+install -dm 755 %{buildroot}/%{inst_dir}/chrome/skin
+for f in chrome/skin/*; do
install -Dpm 644 ${f} \
- %{buildroot}%{inst_dir}/modules/${f##modules/}
+ %{buildroot}%{inst_dir}/${f}
+done
+
+install -dm 755 %{buildroot}/%{inst_dir}/chrome/locale
+for f in chrome/locale/*; do
+ install -dm 755 ${f} \
+ %{buildroot}%{inst_dir}/${f}
+ for g in ${f}/*; do
+ install -Dpm 644 ${g} \
+ %{buildroot}%{inst_dir}/${g}
+ done
+done
+
+install -dm 755 %{buildroot}/%{inst_dir}/defaults
+for f in defaults/*; do
+install -Dpm 644 ${f} \
+ %{buildroot}%{inst_dir}/${f}
+done
+
+install -dm 755 %{buildroot}/%{inst_dir}/lib
+for f in lib/*; do
+install -Dpm 644 ${f} \
+ %{buildroot}%{inst_dir}/${f}
done
# symlink from seamonkey extension to firefox extension
@@ -98,8 +131,12 @@ rm -rf %{buildroot}
%{thunderbird_inst_dir}
%changelog
-* Fri Apr 06 2012 Russell Golden <niveusluna at niveusluna.org> - 2.0.3-4
-- Made to work on EL6
+* Sat Jul 07 2012 Russell Golden <niveusluna at niveusluna.org> - 2.1.1-1
+- update to upstream 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
diff --git a/sources b/sources
index acbb415..ac184bf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0bff4fb4b6bd739b37074270a862e26c mozilla-adblockplus-2.0.3-buildtools.tar.bz2
-dc29a5d1bfbb434a15eece12205dcdc5 mozilla-adblockplus-2.0.3.tar.bz2
+ab2a6776fb2491e692eb0906aa13fef0 mozilla-adblockplus-2.1.1-buildtools.tar.bz2
+90ff7a40103d67e94fb541c7e0393b86 mozilla-adblockplus-2.1.1.tar.bz2
More information about the scm-commits
mailing list