[mozilla-adblockplus/el5: 17/17] Merge branch 'master' into el5

Russell William Golden niveusluna at fedoraproject.org
Sun Nov 6 01:40:38 UTC 2011 

commit e8649250a8ea2f70d5e12a7a3b48d18ca7647bb4
Merge: 5bc172a f6c61f1
Author: Russell William Golden <niveusluna at niveusluna.org>
Date:   Sat Nov 5 20:39:14 2011 -0500

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	mozilla-adblockplus-tarball.sh
    	mozilla-adblockplus.spec
    	sources
    
    Adding support for Thunderbird and SeaMonkey

 .gitignore                               |   10 ++++
 mozilla-adblockplus-1.3.8-buildNum.patch |   12 ++++
 mozilla-adblockplus-tarball.sh           |    4 ++
 mozilla-adblockplus.spec                 |   85 ++++++++++++++++++++++++++++++
 sources                                  |    5 ++
 5 files changed, 116 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 197b9b5,80c5b23..386a846
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,9 +1,12 @@@
  mozilla-adblockplus-1.1.3.tar.bz2
  mozilla-adblockplus-1.1.3-buildtools.tar.bz2
++<<<<<<< HEAD
++=======
+ /adblockplus-1.3.8-source.tgz
+ /mozilla-adblockplus-1.3.8-buildtools.tar.bz2
+ /mozilla-adblockplus-1.3.8.tar.bz2
+ /mozilla-adblockplus-1.3.9-buildtools.tar.bz2
+ /mozilla-adblockplus-1.3.9.tar.bz2
+ /mozilla-adblockplus-1.3.10-buildtools.tar.bz2
+ /mozilla-adblockplus-1.3.10.tar.bz2
++>>>>>>> master
diff --cc mozilla-adblockplus-tarball.sh
index 3d48d3b,28fa394..7302073
--- a/mozilla-adblockplus-tarball.sh
+++ b/mozilla-adblockplus-tarball.sh
@@@ -23,7 -23,7 +23,11 @@@ pwd=$(pwd
  cd "$tmp"
  hg clone https://hg.adblockplus.org/adblockplus/
  cd adblockplus
++<<<<<<< HEAD
 +hg archive --type tbz2 --rev "ADBLOCK_PLUS_${version//./_}_RELEASE" \
++=======
+ hg archive --type tbz2 --rev "${version}" \
++>>>>>>> master
      --prefix "mozilla-adblockplus-$version" \
      "$pwd/mozilla-adblockplus-$version.tar.bz2"
  cd ..
diff --cc mozilla-adblockplus.spec
index c9e9236,a897268..a61c6ca
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@@ -1,14 -1,22 +1,34 @@@
++<<<<<<< HEAD
 +%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 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 %{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}
++>>>>>>> master
  
  # Do not build a debug package, we have nothing to strip
  %define debug_package %{nil}
  
  Name:           mozilla-adblockplus
++<<<<<<< HEAD
 +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
++>>>>>>> master
  
  Group:          Applications/Internet
  License:        MPLv1.1
@@@ -17,15 -25,13 +37,24 @@@ URL:            http://adblockplus.org
  Source0:        %{name}-%{version}.tar.bz2
  Source1:        %{name}-%{version}-buildtools.tar.bz2
  Source99:       %{name}-tarball.sh
++<<<<<<< HEAD
++=======
+ Patch0:         mozilla-adblockplus-1.3.8-buildNum.patch
++>>>>>>> master
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch:      noarch
  
++<<<<<<< HEAD
 +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
++>>>>>>> master
  
  
  %description
@@@ -39,11 -45,12 +68,19 @@@ element hiding over the original Adbloc
  
  %prep
  %setup -q -a 1
++<<<<<<< HEAD
++=======
+ %patch0 -p 1
++>>>>>>> master
  
  
  %build
  mkdir -p _build
++<<<<<<< HEAD
 +perl create_xpi.pl _build/%{name}-%{version}-%{release}.xpi
++=======
+ python build.py build -b %{release} _build/%{name}-%{version}-%{release}.xpi
++>>>>>>> master
  
  
  %install
@@@ -51,13 -58,30 +88,39 @@@ rm -rf %{buildroot
  cd _build
  unzip %{name}-%{version}-%{release}.xpi
  install -dm 755 %{buildroot}%{inst_dir}
++<<<<<<< HEAD
 +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
++>>>>>>> master
  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
++<<<<<<< HEAD
++=======
+ 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}
+ 
+ 
++>>>>>>> master
  
  
  %clean
@@@ -67,9 -91,25 +130,31 @@@ rm -rf %{buildroot
  %files
  %defattr(-,root,root,-)
  %{inst_dir}
++<<<<<<< HEAD
++
 +
++%changelog
++=======
+ %{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
+ 
++>>>>>>> master
  * Fri Mar 19 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-1
  - Update to 1.1.3 (#569137).
  
diff --cc sources
index 1489f42,84798ce..e3dafc4
--- a/sources
+++ b/sources
@@@ -1,2 -1,2 +1,7 @@@
++<<<<<<< HEAD
 +e188583abfa00493a60af89507f657f9  mozilla-adblockplus-1.1.3.tar.bz2
 +9ab5ba609bdc8bcaeac8e9af90c4ab97  mozilla-adblockplus-1.1.3-buildtools.tar.bz2
++=======
+ c5f4fb0a5ac3be5bd028308c93a9d73b  mozilla-adblockplus-1.3.10-buildtools.tar.bz2
+ 47c826b640b42ba708ba509ddb42899f  mozilla-adblockplus-1.3.10.tar.bz2
++>>>>>>> master

More information about the scm-commits mailing list