From 079012a6cedbda1da19a4e000a635dd35098512220b8569fac5fcac332538c36 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sun, 30 Jul 2017 09:20:28 +0000
Subject: [PATCH] Accepting request 509783 from KDE:Qt5

1

OBS-URL: https://build.opensuse.org/request/show/509783
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=22
---
 _constraints               | 12 +-----------
 libqt5-qtwebengine.changes |  8 ++++++++
 libqt5-qtwebengine.spec    |  5 ++++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/_constraints b/_constraints
index 3ee10f7..8616b57 100644
--- a/_constraints
+++ b/_constraints
@@ -4,18 +4,8 @@
    <size unit="G">7</size>
   </disk>
   <memory>
-   <size unit="G">7</size>
+   <size unit="G">9</size>
   </memory>
   <processors>4</processors>
  </hardware>
-  <overwrite>
-    <conditions>
-      <arch>s390x</arch>
-    </conditions>
-    <hardware>
-     <memory>
-      <size unit="G">7</size>
-     </memory>
-    </hardware>
-  </overwrite>
 </constraints>
diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes
index a25da75..14c7611 100644
--- a/libqt5-qtwebengine.changes
+++ b/libqt5-qtwebengine.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 10 09:56:30 UTC 2017 - mlin@suse.com
+
+- Raise memory size to 9G and drop overwrite part of s390z build,
+  we didn't have build s390x at all. (bsc#1047896)
+- Make it -j4 for all archtectures: do not run too many parallel that
+  would costs more memory.
+
 -------------------------------------------------------------------
 Sat Jul  1 08:03:22 UTC 2017 - lbeltrame@kde.org
 
diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec
index 06c7cc4..3255a64 100644
--- a/libqt5-qtwebengine.spec
+++ b/libqt5-qtwebengine.spec
@@ -254,7 +254,10 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
 %endif
         QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads"
 
-%make_jobs
+# do not run too many parallel jobs, per bigger memory size worker it uses more
+# parallel then cost more memory. hardcode it -j4 to match the constraints minumum
+# processors.
+make -j4 VERBOSE=1
 
 %install
 %qmake5_install