[mozilla-adblockplus/f15] Updated to 1.3.8 upstream release

[Andreas Thienemann]

commit 35e96dac3d7d4a7bad98210d076dcd762f6cbd90
Author: Andreas Thienemann <andreas at bawue.net>
Date:   Fri Jun 3 13:11:50 2011 +0200

    Updated to 1.3.8 upstream release

 .gitignore                     |    3 +++
 mozilla-adblockplus-tarball.sh |    2 +-
 mozilla-adblockplus.spec       |   27 +++++++++++++++++++--------
 sources                        |    4 ++--
 4 files changed, 25 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 197b9b5..c1a741e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 mozilla-adblockplus-1.1.3.tar.bz2
 mozilla-adblockplus-1.1.3-buildtools.tar.bz2
+/adblockplus-1.3.8-source.tgz
+/mozilla-adblockplus-1.3.8-buildtools.tar.bz2
+/mozilla-adblockplus-1.3.8.tar.bz2
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 3ebcc05..d9c191f 100644
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@ -6,8 +6,8 @@
 %define debug_package %{nil}
 
 Name:           mozilla-adblockplus
-Version:        1.1.3
-Release:        2%{?dist}
+Version:        1.3.8
+Release:        1%{?dist}
 Summary:        Adblocking extension for Mozilla Firefox
 
 Group:          Applications/Internet
@@ -17,11 +17,12 @@ 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
+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}/
@@ -39,11 +40,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,14 +53,20 @@ 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
 
 %clean
 rm -rf %{buildroot}
@@ -70,6 +78,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 1489f42..9625a86 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
+bc01c8c41e2ade0cb12e0728a516bc0c  mozilla-adblockplus-1.3.8-buildtools.tar.bz2
+bf9840654213f6dfff8d844781efec02  mozilla-adblockplus-1.3.8.tar.bz2