rpms/mozilla-adblockplus/EL-6 .cvsignore, 1.2, 1.3 mozilla-adblockplus.spec, 1.2, 1.3 sources, 1.2, 1.3

[Matej Cepl]

Author: mcepl

Update of /cvs/pkgs/rpms/mozilla-adblockplus/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28122

Modified Files:
	.cvsignore mozilla-adblockplus.spec sources 
Log Message:
First EL-6 build, upgrade to devel/ versions


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mozilla-adblockplus/EL-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2009 13:27:17 -0000	1.2
+++ .cvsignore	24 Jul 2010 16:31:50 -0000	1.3
@@ -1 +1,2 @@
-adblockplus-1.1.1.tar.gz
+mozilla-adblockplus-1.1.3.tar.bz2
+mozilla-adblockplus-1.1.3-buildtools.tar.bz2


Index: mozilla-adblockplus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozilla-adblockplus/EL-6/mozilla-adblockplus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mozilla-adblockplus.spec	27 Aug 2009 13:44:45 -0000	1.2
+++ mozilla-adblockplus.spec	24 Jul 2010 16:31:50 -0000	1.3
@@ -6,20 +6,17 @@
 %define debug_package %{nil}
 
 Name:           mozilla-adblockplus
-Version:        1.1.1
+Version:        1.1.3
 Release:        1%{?dist}
 Summary:        Adblocking extension for Mozilla Firefox
 
 Group:          Applications/Internet
 License:        MPLv1.1
 URL:            http://adblockplus.org/
-# Source can be obtained by hg
-# hg clone http://hg.mozdev.org/adblockplus/ && cd adblockplus
-# If you want a specific release, a list is available with hg tags
-#
-# hg up -r ADBLOCK_PLUS_1_1_1_RELEASE
-# tar cfz adblockplus-1.1.tar.gz adblockplus Packager.pm
-Source0:        adblockplus-%{version}.tar.gz
+# Sources 0 and 1 generated with Source99
+Source0:        %{name}-%{version}.tar.bz2
+Source1:        %{name}-%{version}-buildtools.tar.bz2
+Source99:       %{name}-tarball.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -37,27 +34,30 @@ Mozilla Application Suite-based web brow
 prevent page elements, such as advertisements, from being downloaded and
 displayed.
 It features improvements to the user interface, filter subscriptions, and
-element hiding over the original Adblock extesion.
+element hiding over the original Adblock extension.
 
 
 %prep
-%setup -q -c
+%setup -q -a 1
 
 
 %build
-pushd adblockplus
-perl create_xpi.pl adblockplus-%{version}-%{release}.xpi
-popd
+mkdir -p _build
+perl create_xpi.pl _build/%{name}-%{version}-%{release}.xpi
 
 
 %install
 rm -rf %{buildroot}
-unzip adblockplus/adblockplus-%{version}-%{release}.xpi
-install -D -m 644 chrome.manifest %{buildroot}%{inst_dir}/chrome.manifest
-install -D -m 644 install.rdf %{buildroot}%{inst_dir}/install.rdf
-install -D -m 644 components/AdblockPlus.js %{buildroot}%{inst_dir}/components/AdblockPlus.js
-install -D -m 644 defaults/preferences/adblockplus.js %{buildroot}%{inst_dir}/defaults/preferences/adblockplus.js
-install -D -m 644 chrome/adblockplus.jar %{buildroot}%{inst_dir}/chrome/adblockplus.jar
+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 -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
 
 
 %clean
@@ -70,6 +70,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Mar 19 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-1
+- Update to 1.1.3 (#569137).
+
 * Thu Aug 27 2009 Andreas Thienemann <andreas at bawue.net> - 1.1.1-1
 - Updated to 1.1.1 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mozilla-adblockplus/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2009 13:27:17 -0000	1.2
+++ sources	24 Jul 2010 16:31:50 -0000	1.3
@@ -1 +1,2 @@
-f932c2b1686574c9eb337e89cf2972eb  adblockplus-1.1.1.tar.gz
+e188583abfa00493a60af89507f657f9  mozilla-adblockplus-1.1.3.tar.bz2
+9ab5ba609bdc8bcaeac8e9af90c4ab97  mozilla-adblockplus-1.1.3-buildtools.tar.bz2