[mozilla-adblockplus] Update to 1.3.8 upstream release.

[Andreas Thienemann]

commit c0b72ded460dc84858cf587abbf3c2d06e2e4501
Author: Andreas Thienemann <andreas at bawue.net>
Date:   Fri Jun 3 12:16:55 2011 +0200

    Update to 1.3.8 upstream release.

 .gitignore                               |    3 +++
 mozilla-adblockplus-1.3.8-buildNum.patch |   12 ++++++++++++
 mozilla-adblockplus-tarball.sh           |    2 +-
 mozilla-adblockplus.spec                 |   29 ++++++++++++++++++++---------
 sources                                  |    4 ++--
 5 files changed, 38 insertions(+), 12 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-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 3ebcc05..bb1d09c 100644
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@ -1,3 +1,4 @@
+
 %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}
@@ -6,8 +7,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 +18,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 +41,11 @@ 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 0 _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