From c0f195a4ce9a503c946d5a52ff85a70c8ed25c72 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 8 Feb 2011 10:17:09 -0800 Subject: Firefox 4.0 Beta 11 also, use xz for our generated langpack tarball --- .gitignore | 2 ++ firefox.spec | 13 ++++++++----- sources | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1890efb..6892217 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-4.0b9-20110111.tar.bz2 /firefox-4.0b10.source.tar.bz2 /firefox-langpacks-4.0b10-20110125.tar.bz2 +/firefox-4.0b11.source.tar.bz2 +/firefox-langpacks-4.0b11-20110208.tar.xz diff --git a/firefox.spec b/firefox.spec index 2753e28..6dbe3fa 100644 --- a/firefox.spec +++ b/firefox.spec @@ -16,7 +16,7 @@ # xulrunner_version matches the firefox package. # xulrunner_version_max is first next incompatible xulrunner version -%define xulrunner_version 2.0-0.17b10 +%define xulrunner_version 2.0-0.19b11 %define xulrunner_version_max 2.1 %define official_branding 1 @@ -27,19 +27,19 @@ %define cvsdate 20080327 %define nightly .cvs%{cvsdate} %else -%define prever b10 +%define prever b11 %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 4.0 -Release: 0.14%{?prever}%{?dist} +Release: 0.15%{?prever}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?prever}/source/firefox-%{version}%{?prever}.source.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?prever}-20110125.tar.bz2 +Source1: firefox-langpacks-%{version}%{?prever}-20110208.tar.xz %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -253,7 +253,7 @@ echo > ../%{name}.lang %if %{build_langpacks} # Install langpacks %{__mkdir_p} $RPM_BUILD_ROOT/%{mozappdir}/langpacks -%{__tar} xjf %{SOURCE1} +%{__tar} xf %{SOURCE1} for langpack in `ls firefox-langpacks/*.xpi`; do language=`basename $langpack .xpi` extensiondir=$RPM_BUILD_ROOT/%{mozappdir}/langpacks/langpack-$language@firefox.mozilla.org @@ -379,6 +379,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Feb 08 2011 Christopher Aillon - 4.0-0.15b11 +- Firefox 4.0 Beta 11 + * Mon Feb 07 2011 Christopher Aillon - 4.0-0.14b10 - Bring back the default browser check diff --git a/sources b/sources index 261e382..64a932a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cfbd4a465e5aeb5f0a67cb0b3ad92249 firefox-4.0b10.source.tar.bz2 -0a97d524c1688b5895cc87241e578614 firefox-langpacks-4.0b10-20110125.tar.bz2 +a52b8f4bb98f158ef0639db59dd39bce firefox-4.0b11.source.tar.bz2 +a90bc2d90a1a418aae4e11219905c8ea firefox-langpacks-4.0b11-20110208.tar.xz -- cgit