From 25ebccd71be377a81c57ada598239e378f037a92571fb43467dbcbaaafbf48b1 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sun, 11 May 2014 18:09:20 +0000
Subject: [PATCH] - update to Firefox 29.0.1   * Seer disabled by default
 (bmo#1005958)   * Session Restore failed with a corrupted sessionstore.js
 file     (bmo#1001167)   * pdf.js printing white page (bmo#1003707,
 bnc#876833) - general.useragent.locale gets overwritten with en-US while it  
 should be using the active langpack's setting

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=382
---
 MozillaFirefox.changes       | 11 +++++++++++
 MozillaFirefox.spec          |  8 ++++++--
 compare-locales.tar.xz       |  4 ++--
 create-tar.sh                |  4 ++--
 firefox-29.0-source.tar.xz   |  3 ---
 firefox-29.0.1-source.tar.xz |  3 +++
 l10n-29.0.1.tar.xz           |  3 +++
 l10n-29.0.tar.xz             |  3 ---
 source-stamp.txt             |  2 +-
 9 files changed, 28 insertions(+), 13 deletions(-)
 delete mode 100644 firefox-29.0-source.tar.xz
 create mode 100644 firefox-29.0.1-source.tar.xz
 create mode 100644 l10n-29.0.1.tar.xz
 delete mode 100644 l10n-29.0.tar.xz

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index af22268..58c06ec 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat May 10 06:09:37 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 29.0.1
+  * Seer disabled by default (bmo#1005958)
+  * Session Restore failed with a corrupted sessionstore.js file
+    (bmo#1001167)
+  * pdf.js printing white page (bmo#1003707, bnc#876833)
+- general.useragent.locale gets overwritten with en-US while it
+  should be using the active langpack's setting
+
 -------------------------------------------------------------------
 Sat Apr 26 12:18:07 UTC 2014 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index e037a00..c6a1125 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -18,7 +18,7 @@
 
 
 %define major 29
-%define mainver %major.0
+%define mainver %major.0.1
 %define update_channel release
 
 %if %suse_version > 1220
@@ -65,7 +65,7 @@ Recommends:     gstreamer-0_10-plugins-ffmpeg
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014042500
+%define         releasedate 2014050900
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -371,6 +371,10 @@ cd $RPM_BUILD_DIR/obj
 source %{SOURCE5}
 export MOZ_SOURCE_STAMP=$REV
 export MOZ_SOURCE_REPO=$REPO
+# need to remove default en-US firefox-l10n.js before it gets
+# populated into browser's omni.ja; it only contains general.useragent.locale
+# which should be loaded from each language pack (set in firefox.js)
+rm dist/bin/browser/defaults/preferences/firefox-l10n.js
 make -C browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0
 #DEBUG (break the build if searchplugins are missing / temporary)
 grep amazondotcom dist/firefox/browser/omni.ja
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index 344f01b..b22718c 100644
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02d6b2c593c33691b9fbbbebd90251c27fbd8a01683aad13fd09bade08de7ece
-size 28448
+oid sha256:a0bdebb950897ad8ac5b25d45a547bef7e1c17b450f49a128ea9dd77bbb06d3b
+size 28408
diff --git a/create-tar.sh b/create-tar.sh
index b6ddee4..073e7a5 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_29_0_RELEASE"
-VERSION="29.0"
+RELEASE_TAG="FIREFOX_29_0_1_RELEASE"
+VERSION="29.0.1"
 
 # mozilla
 if [ -d mozilla ]; then
diff --git a/firefox-29.0-source.tar.xz b/firefox-29.0-source.tar.xz
deleted file mode 100644
index 70ea7ef..0000000
--- a/firefox-29.0-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8657d28078baea90ddff1bab8d51a34954fb736c45a8e9bc331427dd73ba1bf1
-size 120606048
diff --git a/firefox-29.0.1-source.tar.xz b/firefox-29.0.1-source.tar.xz
new file mode 100644
index 0000000..30649e6
--- /dev/null
+++ b/firefox-29.0.1-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46f282cdc7346e148cf5b38c80ddec9c396d6a3167fbbe5ca67466525eeea650
+size 120610264
diff --git a/l10n-29.0.1.tar.xz b/l10n-29.0.1.tar.xz
new file mode 100644
index 0000000..af7634a
--- /dev/null
+++ b/l10n-29.0.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bc0f98d4470ab7f9d6703107dae68ebb815e8a450ab1c87066be9b1063a06ee
+size 39987132
diff --git a/l10n-29.0.tar.xz b/l10n-29.0.tar.xz
deleted file mode 100644
index afbefaa..0000000
--- a/l10n-29.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78c0a4a54fad3b44f543c0c63b02ee92cdfff4d187ea78eead271790fc996ead
-size 39970532
diff --git a/source-stamp.txt b/source-stamp.txt
index 3241b88..eea8ade 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=f60bc49e6bd5
+REV=0cd2e9a8ba6f
 REPO=http://hg.mozilla.org/releases/mozilla-release