From c186c491d87c7df2fb08408c289b0d0f1018dfe4 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 20 Dec 2011 13:50:58 +0100 Subject: Update to 9.0 --- .gitignore | 2 ++ firefox.spec | 14 +++++++++----- sources | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d2259ec..5595ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-8.0-20111108.tar.xz /firefox-9.0b5.source.tar.bz2 /firefox-langpacks-9.0b5-20111215.tar.xz +/firefox-9.0.source.tar.bz2 +/firefox-langpacks-9.0-20111220.tar.xz diff --git a/firefox.spec b/firefox.spec index 4577918..41bed40 100644 --- a/firefox.spec +++ b/firefox.spec @@ -10,8 +10,9 @@ %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %global gecko_version 9.0 +%global gecko_release 2 %global alpha_version 0 -%global beta_version 5 +%global beta_version 0 %global rc_version 0 %global mozappdir %{_libdir}/%{name} @@ -35,22 +36,22 @@ %global pre_name rc%{rc_version} %endif %if %{defined pre_version} -%global gecko_verrel %{gecko_version}-%{pre_name} +%global gecko_verrel %{gecko_version}-%{gecko_release}%{pre_name} %global pre_tag .%{pre_version} %else -%global gecko_verrel %{gecko_version} +%global gecko_verrel %{gecko_version}-%{gecko_release} %endif Summary: Mozilla Firefox Web browser Name: firefox Version: 9.0 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?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}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20111215.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20111220.tar.xz %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -343,6 +344,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Dec 20 2011 Jan Horak - 9.0-2 +- Update to 9.0 + * Thu Dec 15 2011 Jan Horak - 9.0-1.beta5 - Update to 9.0 Beta 5 diff --git a/sources b/sources index 87218b1..219fada 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e0ca3b8f9f292f0f1f4d039567d6d9ac firefox-9.0b5.source.tar.bz2 -4bead3e2db1f91552a45e39b5ad048a6 firefox-langpacks-9.0b5-20111215.tar.xz +d8d0c8c79660752b02d9e9ab69a68f94 firefox-9.0.source.tar.bz2 +6aa54400caa2ce933b79cad1e151ebd1 firefox-langpacks-9.0-20111220.tar.xz -- cgit