[mozilla-adblockplus] Update to upstream 2.1.1. And it *should* actually build this time!

[Russell William Golden]

commit e95a305b6fdc9983238bcb010c4aba45db242903
Author: Russell Golden <niveusluna at niveusluna.org>
Date:   Sat Jul 7 13:53:38 2012 -0500

    Update to upstream 2.1.1. And it *should* actually build this time!

 .gitignore               |    2 +
 mozilla-adblockplus.spec |   53 ++++++++++++++++++++++++++++++++++-----------
 sources                  |    4 +-
 3 files changed, 44 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d351b80..37b0673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ mozilla-adblockplus-1.1.3-buildtools.tar.bz2
 /mozilla-adblockplus-2.0.3.tar.bz2
 /mozilla-adblockplus-2.1-buildtools.tar.bz2
 /mozilla-adblockplus-2.1.tar.bz2
+/mozilla-adblockplus-2.1.1-buildtools.tar.bz2
+/mozilla-adblockplus-2.1.1.tar.bz2
diff --git a/mozilla-adblockplus.spec b/mozilla-adblockplus.spec
index 5b10c15..d9be522 100644
--- a/mozilla-adblockplus.spec
+++ b/mozilla-adblockplus.spec
@@ -14,7 +14,7 @@
 %define debug_package %{nil}
 
 Name:           mozilla-adblockplus
-Version:        2.1
+Version:        2.1.1
 Release:        1%{?dist}
 Summary:        Adblocking extension for Mozilla Firefox, Thunderbird, and Seamonkey
 
@@ -70,19 +70,43 @@ rm -rf %{buildroot}
 cd _build
 unzip %{name}-%{version}-%{release}.xpi
 install -dm 755 %{buildroot}%{inst_dir}
-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 -pm 644 chrome.manifest icon.png icon64.png install.rdf bootstrap.js %{buildroot}%{inst_dir}
+
+install -Dpm 644 chrome/content/errors.html %{bulidroot}%{inst_dir}/chrome/content/errors.html
+install -Dpm 644 chrome/content/objtabs.css %{bulidroot}%{inst_dir}/chrome/content/objtabs.css
+
+install -dm 755 %{buildroot}/%{inst_dir}/chrome/content/ui
+for f in chrome/content/ui/*; do
+install -Dpm 644 ${f} \
+    %{buildroot}%{inst_dir}/${f}
+done
+
+install -dm 755 %{buildroot}/%{inst_dir}/chrome/skin
+for f in chrome/skin/*; do
+install -Dpm 644 ${f} \
+    %{buildroot}%{inst_dir}/${f}
+done
+
+install -dm 755 %{buildroot}/%{inst_dir}/chrome/locale
+for f in chrome/locale/*; do
+	install -dm 755 ${f} \
+		%{buildroot}%{inst_dir}/${f}
+	for g in ${f}/*; do
+		install -Dpm 644 ${g} \
+			%{buildroot}%{inst_dir}/${g}
+	done
+done
+
+install -dm 755 %{buildroot}/%{inst_dir}/defaults
+for f in defaults/*; do
 install -Dpm 644 ${f} \
-    %{buildroot}%{inst_dir}/modules/${f##modules/}
+    %{buildroot}%{inst_dir}/${f}
+done
+
+install -dm 755 %{buildroot}/%{inst_dir}/lib
+for f in lib/*; do
+install -Dpm 644 ${f} \
+    %{buildroot}%{inst_dir}/${f}
 done
 
 # symlink from seamonkey extension to firefox extension
@@ -107,6 +131,9 @@ rm -rf %{buildroot}
 %{thunderbird_inst_dir}
 
 %changelog
+* Sat Jul 07 2012 Russell Golden <niveusluna at niveusluna.org> - 2.1.1-1
+- update to upstream 2.1.1
+
 * Mon Jul 02 2012 Russell Golden <niveusluna at niveusluna.org> - 2.1-2
 - update to upstream 2.1
 - add changelog
diff --git a/sources b/sources
index f15e566..ac184bf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e109e518fbf8af09fff250c4fdb10363  mozilla-adblockplus-2.1-buildtools.tar.bz2
-9472a59adf146a8cbf9ef4e712f07869  mozilla-adblockplus-2.1.tar.bz2
+ab2a6776fb2491e692eb0906aa13fef0  mozilla-adblockplus-2.1.1-buildtools.tar.bz2
+90ff7a40103d67e94fb541c7e0393b86  mozilla-adblockplus-2.1.1.tar.bz2