From 39f69ee80fa6df601f8aa209b1bd2c5cfcd4f35ac94daecbb9a61c4fef06bd07 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Fri, 14 Jul 2017 07:51:30 +0000
Subject: [PATCH] Accepting request 508300 from
 home:AndreasStieger:branches:mozilla:Factory

Mozilla Firefox 52.2.1esr, with a slightly faster create-tar.sh

OBS-URL: https://build.opensuse.org/request/show/508300
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=596
---
 MozillaFirefox.changes       |  7 +++++++
 MozillaFirefox.spec          |  4 ++--
 compare-locales.tar.xz       |  4 ++--
 create-tar.sh                | 18 +++++++++++++-----
 firefox-52.2-source.tar.xz   |  3 ---
 firefox-52.2.1-source.tar.xz |  3 +++
 l10n-52.2.1.tar.xz           |  3 +++
 l10n-52.2.tar.xz             |  3 ---
 source-stamp.txt             |  2 +-
 9 files changed, 31 insertions(+), 16 deletions(-)
 delete mode 100644 firefox-52.2-source.tar.xz
 create mode 100644 firefox-52.2.1-source.tar.xz
 create mode 100644 l10n-52.2.1.tar.xz
 delete mode 100644 l10n-52.2.tar.xz

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 1f006ed..4b8eb3c 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul  5 07:26:32 UTC 2017 - astieger@suse.com
+
+- Mozilla Firefox 52.2.1esr:
+  * Printing text does not work on Windows when Direct2D is
+    disabled (bmo#1318845)
+
 -------------------------------------------------------------------
 Wed Jun 14 07:08:29 UTC 2017 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index c8d15cc..bec71f5 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 52
-%define mainver %major.2
+%define mainver %major.2.1
 %define update_channel esr52
-%define releasedate 20170612000000
+%define releasedate 20170629000000
 
 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz
index 313a8f8..a36a751 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:c120f40aa9fa97dc2e9debb0398514dc5873481b65322b645186a476cd49f555
-size 28380
+oid sha256:b14ec1fcbda280d664f73c0cc109dfe70dfd9c82ee73e6b6effcfb91b683e974
+size 28824
diff --git a/create-tar.sh b/create-tar.sh
index 5ccefae..e5aae72 100644
--- a/create-tar.sh
+++ b/create-tar.sh
@@ -7,8 +7,8 @@
 
 CHANNEL="esr52"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_52_2_0esr_RELEASE"
-VERSION="52.2"
+RELEASE_TAG="FIREFOX_52_2_1esr_RELEASE"
+VERSION="52.2.1"
 
 # mozilla
 if [ -d mozilla ]; then
@@ -40,8 +40,16 @@ hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt
 echo -n "REPO=" >> ../source-stamp.txt
 hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt
 popd
+
+# use parallel compression, if available
+compression='-J'
+pixz -h > /dev/null 2>&1
+if (($? != 127)); then
+  compression='-Ipixz'
+fi
+
 echo "creating archive..."
-tar cJf firefox-$VERSION-source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla
+tar $compression -cf firefox-$VERSION-source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla
 
 # l10n
 echo "fetching locales..."
@@ -60,10 +68,10 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do
   esac
 done
 echo "creating l10n archive..."
-tar cJf l10n-$VERSION.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n
+tar $compression -cf l10n-$VERSION.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n
 
 # compare-locales
 echo "creating compare-locales"
 hg clone http://hg.mozilla.org/build/compare-locales
-tar cJf compare-locales.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales
+tar $compression -cf compare-locales.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales
 
diff --git a/firefox-52.2-source.tar.xz b/firefox-52.2-source.tar.xz
deleted file mode 100644
index 1c21be0..0000000
--- a/firefox-52.2-source.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:298e38ec2f230482e081693ebf27add8b4de68782639ec5446102a5e42847b3b
-size 222356940
diff --git a/firefox-52.2.1-source.tar.xz b/firefox-52.2.1-source.tar.xz
new file mode 100644
index 0000000..5dccf44
--- /dev/null
+++ b/firefox-52.2.1-source.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba0a07c30a18029a82304b99ab6d309e297fd4daf154b28dd3fd355b2da58b61
+size 228016352
diff --git a/l10n-52.2.1.tar.xz b/l10n-52.2.1.tar.xz
new file mode 100644
index 0000000..5533b14
--- /dev/null
+++ b/l10n-52.2.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fcc7a6c7f1666fc216a43418dcb698001ca97e1ad2de1620364b50ef79d6c9a7
+size 49291392
diff --git a/l10n-52.2.tar.xz b/l10n-52.2.tar.xz
deleted file mode 100644
index 410a3cc..0000000
--- a/l10n-52.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:508eaf325e8fec62e5147c3ade233b7a32afedc06fff2262115174ffab66c36b
-size 45016424
diff --git a/source-stamp.txt b/source-stamp.txt
index 6340b2f..3fbcfd0 100644
--- a/source-stamp.txt
+++ b/source-stamp.txt
@@ -1,2 +1,2 @@
-REV=f68e0d98a22a
+REV=512efd480dac
 REPO=http://hg.mozilla.org/releases/mozilla-esr52