[mozilla-adblockplus/f14] Adding support for SeaMonkey and Thunderbird

[Russell William Golden]

commit 714914a09ee512f5ce181a167e0421b67af28c15
Author: Russell William Golden <niveusluna at niveusluna.org>
Date:   Sat Nov 5 20:45:56 2011 -0500

    Adding support for SeaMonkey and Thunderbird

 mozilla-adblockplus.spec |   68 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 54 insertions(+), 14 deletions(-)
---
diff --git a/mozilla-adblockplus.spec b/mozilla-adblockplus.spec
index c9e9236..a897268 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:        1.3.10
+Release:        2%{?dist}
+Summary:        Adblocking extension for Mozilla Firefox, Thunderbird, and Seamonkey
 
 Group:          Applications/Internet
 License:        MPLv1.1
@@ -17,15 +25,13 @@ 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
 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
+Requires:       mozilla-filesystem
 
 
 %description
@@ -39,11 +45,12 @@ element hiding over the original Adblock extension.
 
 %prep
 %setup -q -a 1
+%patch0 -p 1
 
 
 %build
 mkdir -p _build
-perl create_xpi.pl _build/%{name}-%{version}-%{release}.xpi
+python build.py build -b %{release} _build/%{name}-%{version}-%{release}.xpi
 
 
 %install
@@ -51,13 +58,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 +91,25 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{inst_dir}
-
+%{seamonkey_inst_dir}
+%{thunderbird_inst_dir}
 
 %changelog
+* 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).