From 579b63ae145910fe7d404f1123b291c4c1016096 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 28 Aug 2012 13:41:27 +0200
Subject: Xulrunner / Firefox 15.0

---
 firefox.spec | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'firefox.spec')

diff --git a/firefox.spec b/firefox.spec
index bc47330..32a2ef1 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,9 +1,12 @@
 # Use system nspr/nss?
-%if 0%{?fedora} < 15
+%if 0%{?fedora} < 15 && 0%{?rhel} < 6
 %define system_nss        0
-%define system_vpx        0
 %else
 %define system_nss        1
+%endif
+%if 0%{?fedora} < 15
+%define system_vpx        0
+%else
 %define system_vpx        1
 %endif
 
@@ -25,13 +28,13 @@
 
 #global shortname              firefox
 #global mycomment              Beta 4
-%global firefox_dir_ver        14
-%global xulrunner_version      14.0.1
+%global firefox_dir_ver        15
+%global xulrunner_version      15.0
 %global xulrunner_release      1
 %global alpha_version          0
 %global beta_version           0
 %global rc_version             0
-%global datelang               20120724
+%global datelang               20120827
 
 %global mozappdir     %{_libdir}/firefox
 %global langpackdir   %{mozappdir}/langpacks
@@ -44,14 +47,17 @@
 %if %{alpha_version} > 0
 %global pre_version a%{alpha_version}
 %global pre_name    alpha%{alpha_version}
+%global tarballdir  mozilla-alpha
 %endif
 %if %{beta_version} > 0
 %global pre_version b%{beta_version}
 %global pre_name    beta%{beta_version}
+%global tarballdir  mozilla-beta
 %endif
 %if %{rc_version} > 0
 %global pre_version rc%{rc_version}
 %global pre_name    rc%{rc_version}
+%global tarballdir  mozilla-release
 %endif
 %if %{defined pre_version}
 %global xulrunner_verrel %{xulrunner_version}-%{xulrunner_release}%{pre_name}
@@ -62,14 +68,14 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        14.0.1
+Version:        15.0
 Release:        1%{?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}-%{datelang}.tar.bz2
+Source1:        firefox-langpacks-%{version}%{?pre_version}-%{datelang}.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -84,7 +90,7 @@ Patch0:         firefox-install-dir.patch
 
 # Fedora patches
 Patch14:        firefox-5.0-asciidel.patch
-Patch15:        firefox-8.0-enable-addons.patch
+Patch15:        firefox-15.0-enable-addons.patch
 
 # Upstream patches
 
@@ -119,7 +125,7 @@ compliance, performance and portability.
 #---------------------------------------------------------------------
 
 %prep
-echo TARGET = %{name}-%{version}-%{release}%{?dist}
+echo TARGET = %{name}-%{version}-%{release}
 %if %{build_langpacks}
 [ -f %{SOURCE1} ] || exit 1
 %endif
@@ -456,6 +462,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Aug 28 2012 Remi Collet <RPMS@FamilleCollet.com> - 15.0-1
+- Sync with rawhide, update to 15.0
+
+* Mon Aug 27 2012 Martin Stransky <stransky@redhat.com> - 15.0-1
+- Update to 15.0
+
+* Wed Aug 22 2012 Dan Horák <dan[at]danny.cz> - 14.0.1-3
+- add fix for secondary arches from xulrunner
+
 * Wed Aug 1 2012 Martin Stransky <stransky@redhat.com> - 14.0.1-2
 - removed StartupWMClass (rhbz#844860)
 
-- 
cgit