diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 6d205c2..5662ee1 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Fri Mar 29 22:15:21 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 20.0 (bnc#813026)
+ * requires NSPR 4.9.5 and NSS 3.14.3
+ * mozilla-webrtc-ppc.patch included upstream
+ * MFSA 2013-30/CVE-2013-0788/CVE-2013-0789
+ Miscellaneous memory safety hazards
+ * MFSA 2013-31/CVE-2013-0800 (bmo#825721)
+ Out-of-bounds write in Cairo library
+ * MFSA 2013-35/CVE-2013-0796 (bmo#827106)
+ WebGL crash with Mesa graphics driver on Linux
+ * MFSA 2013-36/CVE-2013-0795 (bmo#825697)
+ Bypass of SOW protections allows cloning of protected nodes
+ * MFSA 2013-37/CVE-2013-0794 (bmo#626775)
+ Bypass of tab-modal dialog origin disclosure
+ * MFSA 2013-38/CVE-2013-0793 (bmo#803870)
+ Cross-site scripting (XSS) using timed history navigations
+ * MFSA 2013-39/CVE-2013-0792 (bmo#722831)
+ Memory corruption while rendering grayscale PNG images
+- use GStreamer 1.0 starting with 12.3 (mozilla-gstreamer-1.patch)
+
-------------------------------------------------------------------
Tue Mar 12 23:08:15 UTC 2013 - dmueller@suse.com
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 686d518..6127120 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -17,10 +17,16 @@
#
-%define major 19
-%define mainver %major.0.2
+%define major 20
+%define mainver %major.0
%define update_channel release
+%if %suse_version > 1220
+%define gstreamer_ver 1.0
+%else
+%define gstreamer_ver 0.10
+%endif
+
Name: MozillaFirefox
BuildRequires: Mesa-devel
BuildRequires: autoconf213
@@ -44,17 +50,17 @@ BuildRequires: libproxy-devel
%else
BuildRequires: wireless-tools
%endif
-BuildRequires: mozilla-nspr-devel >= 4.9.4
-BuildRequires: mozilla-nss-devel >= 3.14.1
+BuildRequires: mozilla-nspr-devel >= 4.9.5
+BuildRequires: mozilla-nss-devel >= 3.14.3
BuildRequires: nss-shared-helper-devel
%if %suse_version > 1140
-BuildRequires: pkgconfig(gstreamer-0.10)
-BuildRequires: pkgconfig(gstreamer-app-0.10)
-BuildRequires: pkgconfig(gstreamer-plugins-base-0.10)
+BuildRequires: pkgconfig(gstreamer-%gstreamer_ver)
+BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver)
+BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver)
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2013030600
+%define releasedate 2013032900
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@@ -95,10 +101,10 @@ Patch9: mozilla-repo.patch
Patch10: mozilla-sle11.patch
Patch11: mozilla-disable-neon-option.patch
Patch12: mozilla-arm-disable-edsp.patch
-Patch14: mozilla-ppc.patch
-Patch15: mozilla-gstreamer-760140.patch
-Patch17: mozilla-libproxy-compat.patch
-Patch18: mozilla-webrtc-ppc.patch
+Patch13: mozilla-ppc.patch
+Patch14: mozilla-gstreamer-760140.patch
+Patch15: mozilla-libproxy-compat.patch
+Patch16: mozilla-gstreamer-1.patch
# Firefox/browser
Patch30: firefox-browser-css.patch
Patch31: firefox-kde.patch
@@ -111,6 +117,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
Requires: %{name}-branding > 4.0
+Conflicts: %{name}-branding > %{version}
Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
Recommends: libcanberra0
@@ -230,10 +237,10 @@ cd $RPM_BUILD_DIR/mozilla
%endif
#%patch11 -p1
%patch12 -p1
+%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch17 -p1
-%patch18 -p1
+%patch16 -p1
#
%patch30 -p1
%if %suse_version >= 1110
@@ -309,7 +316,7 @@ EOF
%endif
%if %suse_version > 1140
cat << EOF >> $MOZCONFIG
-ac_add_options --enable-gstreamer
+ac_add_options --enable-gstreamer=%{gstreamer_ver}
EOF
%endif
%if %branding
diff --git a/_constraints b/_constraints
index 0e8044f..ed2eb3c 100644
--- a/_constraints
+++ b/_constraints
@@ -5,7 +5,7 @@
9
- 2500
+ 2900
diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2
index c007bf4..c85f481 100644
--- a/compare-locales.tar.bz2
+++ b/compare-locales.tar.bz2
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:61245389d00b57606457b130143a5510da07a3cf3f478fdb9e4117f302911551
-size 29921
+oid sha256:b0e042a5181e3c8f2b2be7ca1673dbe4365f2d82af05598be6ece0af018cc3c2
+size 29925
diff --git a/create-tar.sh b/create-tar.sh
index 4c72b0d..d7b115b 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_19_0_2_RELEASE"
-VERSION="19.0.2"
+RELEASE_TAG="FIREFOX_20_0_RELEASE"
+VERSION="20.0"
# mozilla
echo "cloning $BRANCH..."
diff --git a/firefox-19.0.2-source.tar.bz2 b/firefox-19.0.2-source.tar.bz2
deleted file mode 100644
index 13812f9..0000000
--- a/firefox-19.0.2-source.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:440bf1614da085112cf57349f1d81a52d3ec45697c637f875d60972d4df65da6
-size 99907055
diff --git a/firefox-20.0-source.tar.bz2 b/firefox-20.0-source.tar.bz2
new file mode 100644
index 0000000..1d1d2f0
--- /dev/null
+++ b/firefox-20.0-source.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26d3c849859242fda66e6946daca119e6942eb7b5ce0ef96e4bd878cb5057d47
+size 101075320
diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch
index 4f48eb0..12c275a 100644
--- a/firefox-branded-icons.patch
+++ b/firefox-branded-icons.patch
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent ab9210b3779914924d12de5a3952d4cc52cd9d78
+# Parent 716c063a34dc33046c36b49e3bd2b4ec867d2b5b
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
-@@ -133,16 +133,21 @@ endif
- endif #} LIBXUL_SDK
+@@ -131,16 +131,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
+ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
@@ -54,7 +54,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -541,18 +541,21 @@
+@@ -552,18 +552,21 @@
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
#ifdef SHIP_FEEDBACK
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
diff --git a/firefox-kde.patch b/firefox-kde.patch
index c028382..de496d1 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1276 @@
+@@ -0,0 +1,1221 @@
+#filter substitution
+
+# -*- Mode: HTML -*-
@@ -49,7 +49,6 @@ new file mode 100644
+ windowtype="navigator:browser"
+ macanimationtype="document"
+ screenX="4" screenY="4"
-+ browsingmode="normal"
+ fullscreenbutton="true"
+ persist="screenX screenY width height sizemode">
+
@@ -199,7 +198,7 @@ new file mode 100644
+
++ onclick="SocialUI.undoActivation(this);"/>
+
++ onclick="SocialUI.undoActivation(this);"/>
+#endif
+
+
@@ -283,22 +282,6 @@ new file mode 100644
+ noautofocus="true"
+ position="topcenter topright"/>
+
-+
-+
+