From 57956e4fa7a62c1d6786c6ac863977c06e9d3ed5806eef7031121181aa1690f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 19 Jan 2013 14:37:35 +0000 Subject: [PATCH] Accepting request 149228 from devel:Factory:ARM - raise memory limits / lower parallelism for emulated/native arm builds - raise memory limits / lower parallelism for emulated/native arm builds - add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca) - removed help-ar package because it used English strings - raise memory limits / lower parallelism for emulated/native arm builds - add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca) - removed help-ar package because it used English strings - raise memory limits / lower parallelism for emulated/native arm builds - add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca) - removed help-ar package because it used English strings - raise memory limits / lower parallelism for emulated/native arm builds - add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca) - removed help-ar package because it used English strings OBS-URL: https://build.opensuse.org/request/show/149228 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=21 --- libreoffice-branding-upstream.spec | 2 +- libreoffice-help-en-US.spec | 3 +-- libreoffice-help-group1.changes | 5 +++++ libreoffice-help-group1.spec | 10 +++++++++- libreoffice-help-group2.changes | 9 +++++++-- libreoffice-help-group2.spec | 10 +++++++++- libreoffice-help-group3.changes | 10 +++++++--- libreoffice-help-group3.spec | 10 +++++++++- libreoffice-help-group4.changes | 10 +++++++--- libreoffice-help-group4.spec | 10 +++++++++- libreoffice-help-group5.changes | 9 +++++++-- libreoffice-help-group5.spec | 10 +++++++++- libreoffice-help-groupX.spec.in | 8 ++++++++ libreoffice-icon-themes.spec | 2 +- libreoffice-l10n.spec | 6 +++--- libreoffice.spec | 2 +- 16 files changed, 93 insertions(+), 23 deletions(-) diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index d9f4f41..63fab67 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-branding-upstream # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index 89cea85..2226e79 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-en-US # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -333,5 +333,4 @@ rm -f %_datadir/%lo_home/help_en_US_list.txt.postun 2>/dev/null %files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US %defattr(-,root,root) - %changelog diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes index 8c6748e..fac85aa 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com + +- raise memory limits / lower parallelism for emulated/native arm builds + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index 8fb5e08..034ee88 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group1 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -367,6 +367,11 @@ cd - BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -379,6 +384,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes index 0ed9cad..fac85aa 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com + +- raise memory limits / lower parallelism for emulated/native arm builds + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com @@ -26,8 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com - update version 3.6.1.2 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires (bnc#775840) -- add subpackages: Greek(el), Basque(eu), Finnish(fi) -- move Galician(gl) to the group3 source package +- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca) ------------------------------------------------------------------- Thu Aug 9 09:34:09 UTC 2012 - pmladek@suse.com @@ -209,6 +213,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com - started building helpcontent without libreoffice-*-devel packages; split build had not longer be supported with LO-3.4; disabled many features to keep minimal build dependencies +- removed help-ar package because it used English strings ------------------------------------------------------------------- Wed Jun 8 17:29:54 CEST 2011 - pmladek@suse.cz diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index 2ed89a1..c3c64aa 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -355,6 +355,11 @@ cd - BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -367,6 +372,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes index 8a387df..fac85aa 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com + +- raise memory limits / lower parallelism for emulated/native arm builds + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com @@ -26,7 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com - update version 3.6.1.2 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires (bnc#775840) -- move Galician(gl) subpackage from the group2 source package +- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca) ------------------------------------------------------------------- Thu Aug 9 09:34:09 UTC 2012 - pmladek@suse.com @@ -208,6 +213,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com - started building helpcontent without libreoffice-*-devel packages; split build had not longer be supported with LO-3.4; disabled many features to keep minimal build dependencies +- removed help-ar package because it used English strings ------------------------------------------------------------------- Wed Jun 8 17:29:54 CEST 2011 - pmladek@suse.cz @@ -395,8 +401,6 @@ Mon Dec 7 17:53:37 CET 2009 - pmladek@suse.cz - updated to the milestone ooo320-m7 - updated ooo-build to version 3.1.99.4 (3.2-beta4) - removed obsolete extra localization sources -- used the renamed "gu" instead of "gu-IN" lang code; kept the package - name to keep the backward compatibility ------------------------------------------------------------------- Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index 37ec141..a17537f 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group3 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -367,6 +367,11 @@ cd - BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -379,6 +384,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes index a47b5b7..fac85aa 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com + +- raise memory limits / lower parallelism for emulated/native arm builds + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com @@ -26,8 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com - update version 3.6.1.2 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires (bnc#775840) -- move Brazilian Portuguese(pt-BR) from the group5 source package -- add subpackages: Macedonian(mk), Norwegian Bokmaal(nb) +- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca) ------------------------------------------------------------------- Thu Aug 9 09:34:09 UTC 2012 - pmladek@suse.com @@ -209,7 +213,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com - started building helpcontent without libreoffice-*-devel packages; split build had not longer be supported with LO-3.4; disabled many features to keep minimal build dependencies -- removed help-pa-IN package because it used English strings +- removed help-ar package because it used English strings ------------------------------------------------------------------- Wed Jun 8 17:29:54 CEST 2011 - pmladek@suse.cz diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index a147605..2aa1556 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group4 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -355,6 +355,11 @@ cd - BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -367,6 +372,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes index a4b33d4..fac85aa 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 19 14:31:31 UTC 2013 - dmueller@suse.com + +- raise memory limits / lower parallelism for emulated/native arm builds + ------------------------------------------------------------------- Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com @@ -26,8 +31,7 @@ Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com - update version 3.6.1.2 - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires (bnc#775840) -- add subpackages: Slovak(sk), Turkish(tr), Vietnamese(vi) -- move Brazilian Portuguese(pt-BR) to the group4 source package +- add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca) ------------------------------------------------------------------- Thu Aug 9 09:34:09 UTC 2012 - pmladek@suse.com @@ -209,6 +213,7 @@ Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com - started building helpcontent without libreoffice-*-devel packages; split build had not longer be supported with LO-3.4; disabled many features to keep minimal build dependencies +- removed help-ar package because it used English strings ------------------------------------------------------------------- Wed Jun 8 17:29:54 CEST 2011 - pmladek@suse.cz diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 8a90e5d..14bf539 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group5 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -382,6 +382,11 @@ cd - BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -394,6 +399,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index 377e345..ffc5e69 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -160,6 +160,11 @@ cd - BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -172,6 +177,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec index b1d6851..abba577 100644 --- a/libreoffice-icon-themes.spec +++ b/libreoffice-icon-themes.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-icon-themes # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec index 6ac8152..8a4dfbd 100644 --- a/libreoffice-l10n.spec +++ b/libreoffice-l10n.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice-l10n # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -1664,8 +1664,8 @@ PreReq: grep PreReq: libreoffice >= 3.5 %endif Requires: libreoffice = %{version} -Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res Provides: OpenOffice_org-sh-YU = %version +Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res Obsoletes: OpenOffice_org-sh-YU < %version # compat stuff Provides: OpenOffice_org-sh = %{version} @@ -1752,8 +1752,8 @@ PreReq: libreoffice >= 3.5 %endif Requires: libreoffice = %{version} Requires: scalable-font-ru -Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res Provides: OpenOffice_org-sr-CS = %version +Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res Obsoletes: OpenOffice_org-sr-CS < %version # compat stuff Provides: OpenOffice_org-sr = %{version} diff --git a/libreoffice.spec b/libreoffice.spec index c6909a7..0189c26 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed