rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

Accepting request 149228 from devel:Factory:ARM

Browse Source 
- 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
This commit is contained in:
Tomáš Chvátal 2013-01-19 14:37:35 +00:00 committed by Git OBS Bridge
parent 0d0a702639
commit 57956e4fa7
16 changed files with 93 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libreoffice-branding-upstream.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-branding-upstream # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

3
libreoffice-help-en-US.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-help-en-US # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 %files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog

5
libreoffice-help-group1.changes
View File

@ -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 Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com

10
libreoffice-help-group1.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-help-group1 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -367,6 +367,11 @@ cd -
BUILD_SCRIPT_FLAGS= BUILD_SCRIPT_FLAGS=
# dmake does not work with more than 64 jobs # dmake does not work with more than 64 jobs
lo_jobs="%{?jobs:%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 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" echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
lo_jobs="64" lo_jobs="64"
@ -379,6 +384,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
else else
mem_per_process=200 mem_per_process=200
fi 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_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
max_jobs="$(($max_mem / $mem_per_process))" 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" 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"

9
libreoffice-help-group2.changes
View File

@ -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 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 - update version 3.6.1.2
- LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
(bnc#775840) (bnc#775840)
- add subpackages: Greek(el), Basque(eu), Finnish(fi) - add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
- move Galician(gl) to the group3 source package
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 9 09:34:09 UTC 2012 - pmladek@suse.com 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; - started building helpcontent without libreoffice-*-devel packages;
split build had not longer be supported with LO-3.4; disabled many split build had not longer be supported with LO-3.4; disabled many
features to keep minimal build dependencies 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 Wed Jun 8 17:29:54 CEST 2011 - pmladek@suse.cz

10
libreoffice-help-group2.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-help-group2 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -355,6 +355,11 @@ cd -
BUILD_SCRIPT_FLAGS= BUILD_SCRIPT_FLAGS=
# dmake does not work with more than 64 jobs # dmake does not work with more than 64 jobs
lo_jobs="%{?jobs:%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 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" echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
lo_jobs="64" lo_jobs="64"
@ -367,6 +372,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
else else
mem_per_process=200 mem_per_process=200
fi 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_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
max_jobs="$(($max_mem / $mem_per_process))" 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" 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"

10
libreoffice-help-group3.changes
View File

@ -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 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 - update version 3.6.1.2
- LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
(bnc#775840) (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 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; - started building helpcontent without libreoffice-*-devel packages;
split build had not longer be supported with LO-3.4; disabled many split build had not longer be supported with LO-3.4; disabled many
features to keep minimal build dependencies 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 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 to the milestone ooo320-m7
- updated ooo-build to version 3.1.99.4 (3.2-beta4) - updated ooo-build to version 3.1.99.4 (3.2-beta4)
- removed obsolete extra localization sources - 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 Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz

10
libreoffice-help-group3.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-help-group3 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -367,6 +367,11 @@ cd -
BUILD_SCRIPT_FLAGS= BUILD_SCRIPT_FLAGS=
# dmake does not work with more than 64 jobs # dmake does not work with more than 64 jobs
lo_jobs="%{?jobs:%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 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" echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
lo_jobs="64" lo_jobs="64"
@ -379,6 +384,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
else else
mem_per_process=200 mem_per_process=200
fi 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_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
max_jobs="$(($max_mem / $mem_per_process))" 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" 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"

10
libreoffice-help-group4.changes
View File

@ -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 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 - update version 3.6.1.2
- LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
(bnc#775840) (bnc#775840)
- move Brazilian Portuguese(pt-BR) from the group5 source package - add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
- add subpackages: Macedonian(mk), Norwegian Bokmaal(nb)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 9 09:34:09 UTC 2012 - pmladek@suse.com 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; - started building helpcontent without libreoffice-*-devel packages;
split build had not longer be supported with LO-3.4; disabled many split build had not longer be supported with LO-3.4; disabled many
features to keep minimal build dependencies 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 Wed Jun 8 17:29:54 CEST 2011 - pmladek@suse.cz

10
libreoffice-help-group4.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-help-group4 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -355,6 +355,11 @@ cd -
BUILD_SCRIPT_FLAGS= BUILD_SCRIPT_FLAGS=
# dmake does not work with more than 64 jobs # dmake does not work with more than 64 jobs
lo_jobs="%{?jobs:%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 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" echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
lo_jobs="64" lo_jobs="64"
@ -367,6 +372,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
else else
mem_per_process=200 mem_per_process=200
fi 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_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
max_jobs="$(($max_mem / $mem_per_process))" 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" 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"

9
libreoffice-help-group5.changes
View File

@ -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 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 - update version 3.6.1.2
- LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires - LO is not buildable with gcj; use java-devel >= 1.6 in BuildRequires
(bnc#775840) (bnc#775840)
- add subpackages: Slovak(sk), Turkish(tr), Vietnamese(vi) - add subpackages: Asturian(ast), Bulgarian(bg), Catalan(ca)
- move Brazilian Portuguese(pt-BR) to the group4 source package
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 9 09:34:09 UTC 2012 - pmladek@suse.com 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; - started building helpcontent without libreoffice-*-devel packages;
split build had not longer be supported with LO-3.4; disabled many split build had not longer be supported with LO-3.4; disabled many
features to keep minimal build dependencies 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 Wed Jun 8 17:29:54 CEST 2011 - pmladek@suse.cz

10
libreoffice-help-group5.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-help-group5 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -382,6 +382,11 @@ cd -
BUILD_SCRIPT_FLAGS= BUILD_SCRIPT_FLAGS=
# dmake does not work with more than 64 jobs # dmake does not work with more than 64 jobs
lo_jobs="%{?jobs:%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 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" echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
lo_jobs="64" lo_jobs="64"
@ -394,6 +399,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
else else
mem_per_process=200 mem_per_process=200
fi 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_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
max_jobs="$(($max_mem / $mem_per_process))" 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" 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"

8
libreoffice-help-groupX.spec.in
View File

@ -160,6 +160,11 @@ cd -
BUILD_SCRIPT_FLAGS= BUILD_SCRIPT_FLAGS=
# dmake does not work with more than 64 jobs # dmake does not work with more than 64 jobs
lo_jobs="%{?jobs:%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 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" echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs"
lo_jobs="64" lo_jobs="64"
@ -172,6 +177,9 @@ if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
else else
mem_per_process=200 mem_per_process=200
fi 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_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
max_jobs="$(($max_mem / $mem_per_process))" 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" 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"

2
libreoffice-icon-themes.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-icon-themes # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

6
libreoffice-l10n.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice-l10n # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -1664,8 +1664,8 @@ PreReq: grep
PreReq: libreoffice >= 3.5 PreReq: libreoffice >= 3.5
%endif %endif
Requires: libreoffice = %{version} 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 = %version
Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res
Obsoletes: OpenOffice_org-sh-YU < %version Obsoletes: OpenOffice_org-sh-YU < %version
# compat stuff # compat stuff
Provides: OpenOffice_org-sh = %{version} Provides: OpenOffice_org-sh = %{version}
@ -1752,8 +1752,8 @@ PreReq: libreoffice >= 3.5
%endif %endif
Requires: libreoffice = %{version} Requires: libreoffice = %{version}
Requires: scalable-font-ru 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 = %version
Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res
Obsoletes: OpenOffice_org-sr-CS < %version Obsoletes: OpenOffice_org-sr-CS < %version
# compat stuff # compat stuff
Provides: OpenOffice_org-sr = %{version} Provides: OpenOffice_org-sr = %{version}

2
libreoffice.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed