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

Russell William Golden niveusluna at fedoraproject.org
Sun Nov 6 01:44:52 UTC 2011


commit 83cae7b97ef591aee38f37ff621f101d5cc3ca5e
Author: Russell William Golden <niveusluna at niveusluna.org>
Date:   Sat Nov 5 20:44:29 2011 -0500

    Adding support for Thunderbird and SeaMonkey

 mozilla-adblockplus.spec |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/mozilla-adblockplus.spec b/mozilla-adblockplus.spec
index 235bd9e..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.3.10
-Release:        1%{?dist}
-Summary:        Adblocking extension for Mozilla Firefox
+Release:        2%{?dist}
+Summary:        Adblocking extension for Mozilla Firefox, Thunderbird, and Seamonkey
 
 Group:          Applications/Internet
 License:        MPLv1.1
@@ -23,10 +31,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  zip, python, sed, python-jinja2
-# 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
+Requires:       mozilla-filesystem
 
 
 %description
@@ -68,6 +73,17 @@ 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
 rm -rf %{buildroot}
 
@@ -75,9 +91,13 @@ 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
 


More information about the scm-commits mailing list