# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1369898530 -7200
# Node ID de1740022f78d44db1da0bf1239a4b01bab68b97
# Parent  a3eaf3bb0cc9132862fc6d2ce2ae3fd0352c9a2b# Parent  6fd0ed97283f2839ffe35a638f4ec36960a7e9c8
merge from 21 release

diff -r a3eaf3bb0cc9 -r de1740022f78 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Fri May 10 07:16:10 2013 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu May 30 09:22:10 2013 +0200
@@ -1,7 +1,22 @@
 -------------------------------------------------------------------
-Sun Apr 14 09:28:05 UTC 2013 - wr@rosenauer.org
-
-- update to Firefox 21.0b2 
+Fri May 10 05:25:39 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 21.0 (bnc#819204)
+  * removed upstreamed patch firefox-712763.patch
+  * removed disabled mozilla-disable-neon-option.patch
+  * MFSA 2013-41/CVE-2013-0801/CVE-2013-1669
+    Miscellaneous memory safety hazards
+  * MFSA 2013-42/CVE-2013-1670 (bmo#853709)
+    Privileged access for content level constructor
+  * MFSA 2013-43/CVE-2013-1671 (bmo#842255)
+    File input control has access to full path
+  * MFSA 2013-46/CVE-2013-1674 (bmo#860971)
+    Use-after-free with video and onresize event
+  * MFSA 2013-47/CVE-2013-1675 (bmo#866825)
+    Uninitialized functions in DOMSVGZoomEvent
+  * MFSA 2013-48/CVE-2013-1676/CVE-2013-1677/CVE-2013-1678/
+    CVE-2013-1679/CVE-2013-1680/CVE-2013-1681
+    Memory corruption found using Address Sanitizer
 
 -------------------------------------------------------------------
 Tue Apr  9 06:41:31 UTC 2013 - wr@rosenauer.org
diff -r a3eaf3bb0cc9 -r de1740022f78 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Fri May 10 07:16:10 2013 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu May 30 09:22:10 2013 +0200
@@ -17,9 +17,9 @@
 #
 
 
-%define major 20
-%define mainver %major.99
-%define update_channel beta
+%define major 21
+%define mainver %major.0
+%define update_channel release
 
 %if %suse_version > 1220
 %define gstreamer_ver 0.10
@@ -60,7 +60,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013041300
+%define         releasedate 2013051000
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -188,7 +188,7 @@
 %package branding-upstream
 Summary:        Upstream branding for Firefox
 Group:          Productivity/Networking/Web/Browsers
-Provides:       %{name}-branding = 5.0
+Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(%{name}-branding)
 Supplements:    packageand(%{name}:branding-upstream)
 #BRAND: Provide three files -
@@ -352,7 +352,7 @@
 # copy tree into RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{progdir}
 cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir}
-mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/distribution/extensions
+mkdir -p $RPM_BUILD_ROOT%{progdir}/distribution/extensions
 mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/searchplugins
 mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/
 # install kde.js
@@ -560,8 +560,8 @@
 %{progdir}/browser/blocklist.xml
 %{progdir}/browser/chrome.manifest
 %{progdir}/browser/omni.ja
-%dir %{progdir}/browser/distribution/
-%{progdir}/browser/distribution/extensions/
+%dir %{progdir}/distribution/
+%{progdir}/distribution/extensions/
 %{progdir}/components/
 %{progdir}/defaults/
 %{progdir}/dictionaries/
diff -r a3eaf3bb0cc9 -r de1740022f78 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Fri May 10 07:16:10 2013 +0200
+++ b/MozillaFirefox/create-tar.sh	Thu May 30 09:22:10 2013 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_21_0b2_RELEASE"
-VERSION="20.99"
+RELEASE_TAG="FIREFOX_21_0_RELEASE"
+VERSION="21.0"
 
 # mozilla
 if [ -d mozilla ]; then