[mozilla-adblockplus/el6] Update to upstream 2.0.3. Attempt to add workaround from packaging mailing list. Fail at it. Commit
Russell William Golden
niveusluna at fedoraproject.org
Fri Apr 6 15:56:29 UTC 2012
commit d0f8cb8c30583cf64bb7d0356f255b496d1c52c8
Author: Russell Golden <niveusluna at centos6.(none)>
Date: Fri Apr 6 10:55:24 2012 -0500
Update to upstream 2.0.3.
Attempt to add workaround from packaging mailing list. Fail at it.
Commit so someone else can take a look-see.
.gitignore | 2 +
disable-safeads.patch | 12 ++++
mozilla-adblockplus-1.3.8-buildNum.patch | 12 ++++
mozilla-adblockplus-tarball.sh | 2 +-
mozilla-adblockplus.spec | 83 +++++++++++++++++++++++++-----
sources | 4 +-
6 files changed, 98 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 197b9b5..acd7afe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
mozilla-adblockplus-1.1.3.tar.bz2
mozilla-adblockplus-1.1.3-buildtools.tar.bz2
+/mozilla-adblockplus-2.0.3-buildtools.tar.bz2
+/mozilla-adblockplus-2.0.3.tar.bz2
diff --git a/disable-safeads.patch b/disable-safeads.patch
new file mode 100644
index 0000000..dc97526
--- /dev/null
+++ b/disable-safeads.patch
@@ -0,0 +1,12 @@
+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
+ 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);
+-pref("extensions.adblockplus.subscriptions_exceptionsurl", "https://easylist-downloads.adblockplus.org/exceptionrules.txt");
++pref("extensions.adblockplus.subscriptions_exceptionsurl", "");
+ pref("extensions.adblockplus.subscriptions_exceptionscheckbox", true);
+ pref("extensions.adblockplus.documentation_link", "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%");
+ pref("extensions.adblockplus.savestats", true);
diff --git a/mozilla-adblockplus-1.3.8-buildNum.patch b/mozilla-adblockplus-1.3.8-buildNum.patch
new file mode 100644
index 0000000..06294fc
--- /dev/null
+++ b/mozilla-adblockplus-1.3.8-buildNum.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-adblockplus-1.3.8/buildtools/build.py.orig mozilla-adblockplus-1.3.8/buildtools/build.py
+--- mozilla-adblockplus-1.3.8/buildtools/build.py.orig 2011-06-03 12:04:50.663238413 +0200
++++ mozilla-adblockplus-1.3.8/buildtools/build.py 2011-06-03 12:05:02.098081838 +0200
+@@ -150,7 +150,7 @@ def runBuild(baseDir, scriptName, opts,
+ if option in ('-l', '--locales'):
+ locales = value.split(',')
+ elif option in ('-b', '--build'):
+- buildNum = int(value)
++ buildNum = value
+ elif option in ('-k', '--key'):
+ keyFile = value
+ elif option in ('-r', '--release'):
diff --git a/mozilla-adblockplus-tarball.sh b/mozilla-adblockplus-tarball.sh
index 3d48d3b..28fa394 100755
--- a/mozilla-adblockplus-tarball.sh
+++ b/mozilla-adblockplus-tarball.sh
@@ -23,7 +23,7 @@ pwd=$(pwd)
cd "$tmp"
hg clone https://hg.adblockplus.org/adblockplus/
cd adblockplus
-hg archive --type tbz2 --rev "ADBLOCK_PLUS_${version//./_}_RELEASE" \
+hg archive --type tbz2 --rev "${version}" \
--prefix "mozilla-adblockplus-$version" \
"$pwd/mozilla-adblockplus-$version.tar.bz2"
cd ..
diff --git a/mozilla-adblockplus.spec b/mozilla-adblockplus.spec
index c9e9236..db50062 100644
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@ -1,14 +1,22 @@
+%define moz_ext_dir %{_datadir}/mozilla/extensions
+
%define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
%define src_ext_id \{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d\}
-%define inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}/%{src_ext_id}
+%define inst_dir %{moz_ext_dir}/%{firefox_app_id}/%{src_ext_id}
+
+%define seamonkey_app_id \{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\}
+%define seamonkey_inst_dir %{moz_ext_dir}/%{seamonkey_app_id}/%{src_ext_id}
+
+%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
+%define thunderbird_inst_dir %{moz_ext_dir}/%{thunderbird_app_id}/%{src_ext_id}
# Do not build a debug package, we have nothing to strip
%define debug_package %{nil}
Name: mozilla-adblockplus
-Version: 1.1.3
-Release: 1%{?dist}
-Summary: Adblocking extension for Mozilla Firefox
+Version: 2.0.3
+Release: 3%{?dist}
+Summary: Adblocking extension for Mozilla Firefox, Thunderbird, and Seamonkey
Group: Applications/Internet
License: MPLv1.1
@@ -17,15 +25,14 @@ 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
+Patch1: disable-safeads.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: zip, perl, sed
-# Commented, rpm seems not to be able to handle this anymore
-# Requirements are defined as files in order to better cope with changing firefox/mozilla packages
-#Requires: %{_libdir}/mozilla/extensions/, %{_libdir}/mozilla/extensions/%{firefox_app_id}/
-Requires: firefox
+BuildRequires: zip, python, sed, python-jinja2-26
+Requires: mozilla-filesystem
%description
@@ -39,11 +46,14 @@ element hiding over the original Adblock extension.
%prep
%setup -q -a 1
+%patch0 -p 1
+%patch1 -p 1
%build
mkdir -p _build
-perl create_xpi.pl _build/%{name}-%{version}-%{release}.xpi
+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
%install
@@ -51,13 +61,30 @@ rm -rf %{buildroot}
cd _build
unzip %{name}-%{version}-%{release}.xpi
install -dm 755 %{buildroot}%{inst_dir}
-install -pm 644 chrome.manifest icon.png install.rdf %{buildroot}%{inst_dir}
-install -Dpm 644 components/AdblockPlus.js \
- %{buildroot}%{inst_dir}/components/AdblockPlus.js
+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 -Dpm 644 ${f} \
+ %{buildroot}%{inst_dir}/modules/${f##modules/}
+done
+
+# symlink from seamonkey extension to firefox extension
+mkdir -p %{buildroot}%{moz_ext_dir}/%{seamonkey_app_id}
+ln -s %{inst_dir} %{buildroot}%{seamonkey_inst_dir}
+
+# symlink from thunderbird extension to firefox extension
+mkdir -p %{buildroot}%{moz_ext_dir}/%{thunderbird_app_id}
+ln -s %{inst_dir} %{buildroot}%{thunderbird_inst_dir}
+
+
%clean
@@ -67,9 +94,37 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{inst_dir}
-
+%{seamonkey_inst_dir}
+%{thunderbird_inst_dir}
%changelog
+* Fri Jan 20 2012 Russell Golden <niveusluna at niveusluna.org> - 2.0.3-3
+- build release build, not debug build
+
+* Thu Jan 05 2012 Russell Golden <niveusluna at niveusluna.org> - 2.0.3-2
+- Disable the "safe ads" feature by default
+
+* Thu Jan 05 2012 Russell Golden <niveusluna at niveusluna.org> - 2.0.3-1
+- Update to upstream 2.0.3 release
+
+* Tue Nov 15 2011 Russell Golden <niveusluna at niveusluna.org> - 1.3.10-3
+- Rebuild with buildroot override for firefox 8
+
+* Sun Oct 30 2011 Russell Golden <niveusluna at niveusluna.org> - 1.3.10-2
+- Include support for Thunderbird and SeaMonkey
+
+* Wed Oct 05 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.10-1
+- Update to 1.3.9 for FF7
+
+* Thu Aug 18 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.3.9-1
+- Update to 1.3.9 for FF6
+
+* Fri Jun 03 2011 Andreas Thienemann <andreas at bawue.net> - 1.3.8-1
+- Updated to 1.3.8 upstream release
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Fri Mar 19 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-1
- Update to 1.1.3 (#569137).
diff --git a/sources b/sources
index 1489f42..acbb415 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e188583abfa00493a60af89507f657f9 mozilla-adblockplus-1.1.3.tar.bz2
-9ab5ba609bdc8bcaeac8e9af90c4ab97 mozilla-adblockplus-1.1.3-buildtools.tar.bz2
+0bff4fb4b6bd739b37074270a862e26c mozilla-adblockplus-2.0.3-buildtools.tar.bz2
+dc29a5d1bfbb434a15eece12205dcdc5 mozilla-adblockplus-2.0.3.tar.bz2
More information about the scm-commits
mailing list