# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1372068459 -7200
# Node ID 3b3a6d8cdaab961255bfdeb7bfa121ddd92e5363
# Parent  19262ba479c40bcd7f6d24650e19b5d1732d8a86
22.0 build 2

diff -r 19262ba479c4 -r 3b3a6d8cdaab MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sun Jun 16 23:55:43 2013 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Jun 24 12:07:39 2013 +0200
@@ -1,10 +1,12 @@
 -------------------------------------------------------------------
-Sun Jun 16 21:54:10 UTC 2013 - wr@rosenauer.org
-
-- update to Firefox 22.0b5
+Sat Jun 22 17:48:06 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 22.0 (bnc#825935)
   * removed obsolete patches
     + mozilla-qcms-ppc.patch
     + mozilla-gstreamer-760140.patch
+  * GStreamer support does not build on 12.1 anymore (build only
+    on 12.2 and later)
 
 -------------------------------------------------------------------
 Tue Jun 11 21:06:58 UTC 2013 - dvaleev@suse.com
diff -r 19262ba479c4 -r 3b3a6d8cdaab MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Jun 16 23:55:43 2013 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Jun 24 12:07:39 2013 +0200
@@ -17,9 +17,9 @@
 #
 
 
-%define major 21
-%define mainver %major.99
-%define update_channel beta
+%define major 22
+%define mainver %major.0
+%define update_channel release
 
 %if %suse_version > 1220
 %define gstreamer_ver 0.10
@@ -53,14 +53,14 @@
 BuildRequires:  mozilla-nspr-devel >= 4.9.6
 BuildRequires:  mozilla-nss-devel >= 3.14.3
 BuildRequires:  nss-shared-helper-devel
-%if %suse_version > 1140
+%if %suse_version > 1210
 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 2013061500
+%define         releasedate 2013062200
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -306,7 +306,7 @@
 ac_add_options --enable-gio
 EOF
 %endif
-%if %suse_version > 1140
+%if %suse_version > 1210
 cat << EOF >> $MOZCONFIG
 ac_add_options --enable-gstreamer
 EOF
@@ -553,7 +553,7 @@
 %{progdir}/browser/defaults
 %{progdir}/browser/icons/
 %{progdir}/browser/chrome/icons
-%{progdir}/browser/distribution/
+#%{progdir}/browser/distribution/
 %{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 %{progdir}/browser/searchplugins/
 %{progdir}/browser/blocklist.xml
diff -r 19262ba479c4 -r 3b3a6d8cdaab MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Sun Jun 16 23:55:43 2013 +0200
+++ b/MozillaFirefox/create-tar.sh	Mon Jun 24 12:07:39 2013 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_22_0b5_RELEASE"
-VERSION="21.99"
+RELEASE_TAG="FIREFOX_22_0_RELEASE"
+VERSION="22.0"
 
 # mozilla
 if [ -d mozilla ]; then