Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2012-07-14 20:32:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice", Maintainer is "pmla...@suse.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-branding-upstream.changes
2012-07-03 20:28:22.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-branding-upstream.changes
2012-07-14 20:32:40.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 9 17:06:28 UTC 2012 - pmla...@suse.com
+
+- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3)
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-en-US.changes
2012-07-03 20:28:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-help-en-US.changes
2012-07-14 20:32:44.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Jul 9 17:06:28 UTC 2012 - pmla...@suse.com
+
+- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3)
+- reduce build parallelism to reduce build crashes:
+ * dmake support 64 jobs at maximum
+ * do not eat all memory with some huge sources
+- add procps into BuildRequires to check available memory
+
+-------------------------------------------------------------------
libreoffice-help-group1.changes: same change
libreoffice-help-group2.changes: same change
libreoffice-help-group3.changes: same change
libreoffice-help-group4.changes: same change
libreoffice-help-group5.changes: same change
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice-icon-themes.changes
2012-07-03 20:28:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-icon-themes.changes
2012-07-14 20:32:44.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 9 17:06:28 UTC 2012 - pmla...@suse.com
+
+- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3)
+
+-------------------------------------------------------------------
libreoffice-l10n.changes: same change
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2012-07-03
20:28:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes
2012-07-14 20:32:48.000000000 +0200
@@ -1,0 +2,24 @@
+Fri Jul 13 10:37:51 UTC 2012 - pmla...@suse.com
+
+- used the internal mysql cppconnector even for openSUSE-12.3;
+ it did not build with the system one
+
+-------------------------------------------------------------------
+Mon Jul 9 17:06:28 UTC 2012 - pmla...@suse.com
+
+- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3)
+ * clip max entries
+ * XLSX import crasher (fdo#51601)
+ * double border import regression
+ * add SUSE black and white branding
+ * check for invalid tab number (fdo#51667)
+ * query for parameters in Base reports crasher (fdo#51619)
+ * fix MySQL, GDocs, and LanguageTool extension registration
+ * make sure we don't export shapes with negative size (bnc#760997)
+ * make sure all tab pages have the same dimensions (fdo#49921, bnc#769162)
+- reduce build parallelism to reduce build crashes:
+ * dmake support 64 jobs at maximum
+ * do not eat all memory with some huge sources
+- add procps into BuildRequires to check available memory
+
+-------------------------------------------------------------------
Old:
----
libreoffice-binfilter-3.5.4.6.tar.bz2
libreoffice-core-3.5.4.6.tar.bz2
libreoffice-help-3.5.4.6.tar.bz2
libreoffice-translations-3.5.4.6.tar.bz2
New:
----
libreoffice-binfilter-3.5.4.7.tar.bz2
libreoffice-core-3.5.4.7.tar.bz2
libreoffice-help-3.5.4.7.tar.bz2
libreoffice-translations-3.5.4.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-branding-upstream.spec ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:03.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:03.000000000 +0200
@@ -17,10 +17,10 @@
Name: libreoffice-branding-upstream
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
-%define lo_build_version 3.5.4.6
-%define lo_piece_version 3.5.4.6
+%define lo_build_version 3.5.4.7
+%define lo_piece_version 3.5.4.7
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
Summary: Original Branding for LibreOffice
++++++ libreoffice-help-en-US.spec ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:03.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:03.000000000 +0200
@@ -22,7 +22,7 @@
## Generated by:
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
###################################################################
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301
@@ -63,6 +63,7 @@
BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib
BuildRequires: pkg-config
+BuildRequires: procps
BuildRequires: unzip
BuildRequires: xorg-x11-devel
BuildRequires: zip
@@ -182,24 +183,46 @@
PARALLEL_BUILD=
BUILD_SCRIPT_FLAGS=
ncpus=
-# parallel build of modules; it makes sense on machines with more CPUs
-if test "%build_module_in_parallel" = "1" ; then
- ncpus=`grep ^processor /proc/cpuinfo | wc -l`
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor
/proc/cpuinfo | wc -l`"
+#
+# Parallel build settings ...
+BUILD_SCRIPT_FLAGS=
+# dmake does not work with more than 64 jobs
+lo_jobs="%{?jobs:%jobs}"
+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"
fi
-if test "%build_module_in_parallel" -gt "1" ; then
- ncpus=%build_module_in_parallel
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+# do not eat all memory
+lo_jobs_reduced=
+if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
+ if test `uname -i` = "x86_64" ; then
+ mem_per_process=300
+ else
+ mem_per_process=200
+ fi
+ 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"
+ test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the
parallel build at all becuse of memory limits"
fi
-if test -n "$ncpus" ; then
- PARALLEL_BUILD="--with-num-cpus=$ncpus"
- BUILD_SCRIPT_FLAGS="-P$ncpus"
+# finally set jobs
+PARALLEL_BUILD=
+if test -n "$lo_jobs" ; then
+ PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
+ BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
fi
-if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e
"/opt/icecream/bin/g++" ; then
- PARALLEL_BUILD="$PARALLEL_BUILD
- --with-gcc-speedup=icecream
- --with-max-jobs=%jobs"
- BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+# parallel build of modules
+# it makes sense on machines with more CPUs
+num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
+# again reduce to 64 CPUs because of dmake
+test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not
support more than 64 processes => reducing number of used cpus"
+# allow only 2 modules if there more jobs allowed in one module
+test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
+PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
+BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
+# using icecream
+if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+ PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
fi
%endif
# make sure that JAVA_HOME is set correctly
++++++ libreoffice-help-group1.spec ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:03.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:03.000000000 +0200
@@ -22,7 +22,7 @@
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301
@@ -75,6 +75,7 @@
BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib
BuildRequires: pkg-config
+BuildRequires: procps
BuildRequires: python-devel
BuildRequires: unzip
BuildRequires: xorg-x11-devel
@@ -277,24 +278,46 @@
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS
-DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
%endif
-# parallel build of modules; it makes sense on machines with more CPUs
-if test "%build_module_in_parallel" = "1" ; then
- ncpus=`grep ^processor /proc/cpuinfo | wc -l`
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor
/proc/cpuinfo | wc -l`"
+#
+# Parallel build settings ...
+BUILD_SCRIPT_FLAGS=
+# dmake does not work with more than 64 jobs
+lo_jobs="%{?jobs:%jobs}"
+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"
fi
-if test "%build_module_in_parallel" -gt "1" ; then
- ncpus=%build_module_in_parallel
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+# do not eat all memory
+lo_jobs_reduced=
+if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
+ if test `uname -i` = "x86_64" ; then
+ mem_per_process=300
+ else
+ mem_per_process=200
+ fi
+ 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"
+ test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the
parallel build at all becuse of memory limits"
fi
-if test -n "$ncpus" ; then
- PARALLEL_BUILD="--with-num-cpus=$ncpus"
- BUILD_SCRIPT_FLAGS="-P$ncpus"
+# finally set jobs
+PARALLEL_BUILD=
+if test -n "$lo_jobs" ; then
+ PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
+ BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
fi
-if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e
"/opt/icecream/bin/g++" ; then
- PARALLEL_BUILD="$PARALLEL_BUILD
- --with-gcc-speedup=icecream
- --with-max-jobs=%jobs"
- BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+# parallel build of modules
+# it makes sense on machines with more CPUs
+num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
+# again reduce to 64 CPUs because of dmake
+test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not
support more than 64 processes => reducing number of used cpus"
+# allow only 2 modules if there more jobs allowed in one module
+test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
+PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
+BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
+# using icecream
+if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+ PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
fi
%endif
# make sure that JAVA_HOME is set correctly
libreoffice-help-group2.spec: same change
libreoffice-help-group3.spec: same change
libreoffice-help-group4.spec: same change
libreoffice-help-group5.spec: same change
++++++ libreoffice-icon-themes.spec ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:03.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:03.000000000 +0200
@@ -17,7 +17,7 @@
Name: libreoffice-icon-themes
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
%define ooo_home libreoffice
BuildRequires: libreoffice-icon-themes-prebuilt = %version
++++++ libreoffice-l10n.spec ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:04.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:04.000000000 +0200
@@ -22,7 +22,7 @@
## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data
###################################################################
Name: libreoffice-l10n
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
%define piece l10n
%define ooo_home libreoffice
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:04.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:04.000000000 +0200
@@ -47,6 +47,7 @@
BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib
BuildRequires: postgresql-devel
+BuildRequires: procps
BuildRequires: python-devel
BuildRequires: recode
BuildRequires: unixODBC-devel
@@ -102,7 +103,7 @@
%if 0%{?suse_version}
BuildRequires: libmysqlclient-devel
%endif
-%if 0%{?suse_version} > 01220
+%if 0%{?suse_version} > 01230
# mysqlcppconn >= 1.0.6 is needed
BuildRequires: libmysqlcppconn-devel
%endif
@@ -163,10 +164,6 @@
# test_build_SDK: 0 = no
# 1 = yes (if possible, see below the definition of
lo_build_sdk)
%define test_build_sdk 1
-# build_module_in_parallel 0 = no
-# 1 = yes (the number is defined be the number of cpus)
-# 2,3,4... = yes (force the number of modules to be
built in parallel)
-%define build_module_in_parallel 1
# debug_build: 0 = no
# 1 = yes (enable depency tracking, ccache)
%define debug_build 0
@@ -213,7 +210,7 @@
# the manifest file must be in the right place; registration does not work
with some repacked jars
%define __jar_repack %{nil}
%endif
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
Requires: libreoffice-branding < 4
Requires: libreoffice-branding > 3.2.99.3
@@ -1388,17 +1385,41 @@
%endif
#
# Parallel build settings ...
-PARALLEL_BUILD=
-if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e
"/opt/icecream/bin/g++" ; then
- PARALLEL_BUILD="--with-gcc-speedup=icecream
- --with-max-jobs=%jobs"
+# dmake does not work with more than 64 jobs
+lo_jobs="%{?jobs:%jobs}"
+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"
+fi
+# do not eat all memory
+lo_jobs_reduced=
+if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
+ if test `uname -i` = "x86_64" ; then
+ mem_per_process=300
+ else
+ mem_per_process=200
+ fi
+ 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"
+ test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the
parallel build at all becuse of memory limits"
fi
-# parallel build of modules; it makes sense on machines with more CPUs
-if test "%build_module_in_parallel" = "1" ; then
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor
/proc/cpuinfo | wc -l`"
+# finally set jobs
+PARALLEL_BUILD=
+if test -n "$lo_jobs" ; then
+ PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
fi
-if test "%build_module_in_parallel" -gt "1" ; then
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+# parallel build of modules
+# it makes sense on machines with more CPUs
+num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
+# again reduce to 64 CPUs because of dmake
+test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not
support more than 64 processes => reducing number of used cpus"
+# allow only 2 modules if there more jobs allowed in one module
+test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
+PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
+# using icecream
+if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+ PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
fi
#
# disable KDE4 on openSUSE-11.1-Evergreen but not on SLED11
++++++ libreoffice-binfilter-3.5.4.6.tar.bz2 ->
libreoffice-binfilter-3.5.4.7.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-binfilter-3.5.4.6.tar.bz2
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-binfilter-3.5.4.7.tar.bz2
differ: char 11, line 1
++++++ libreoffice-core-3.5.4.6.tar.bz2 -> libreoffice-core-3.5.4.7.tar.bz2
++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-core-3.5.4.6.tar.bz2
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-core-3.5.4.7.tar.bz2
differ: char 11, line 1
++++++ libreoffice-help-3.5.4.6.tar.bz2 -> libreoffice-help-3.5.4.7.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-help-3.5.4.6/ChangeLog
new/libreoffice-help-3.5.4.7/ChangeLog
--- old/libreoffice-help-3.5.4.6/ChangeLog 2012-06-28 14:59:44.000000000
+0200
+++ new/libreoffice-help-3.5.4.7/ChangeLog 2012-07-09 19:01:37.000000000
+0200
@@ -1,3 +1,22 @@
+2012-07-09 Petr Mladek <pmla...@suse.cz>
[e49ee62c213ccbc017909290edb30dad41d925a7]
+
+Version 3.5.4.7 (SUSE 3.5-rc3), tag suse-3.5.4.7
+
+Change-Id: If36540b9a330208569892097fe34bbb4869f9987
+
+2012-07-09 Petr Mladek <pmla...@suse.cz>
[b7769651ff117e8cdabb354f1a329f87b0ca73af]
+
+Branch suse-3.5.4
+
+This is 'suse-3.5.4' - the stable branch for the initial SUSE 3.5 release.
+Please, do not push any changes here. We will cherry-pick only the critical,
+well tested, and safe changes from suse-3.5 branch.
+
+Please, continue to commit L3 and other important but safe fixes into the
suse-3.5
+branch. It will be used as a base for PTF builds and upcoming 3.5 bugfix
releases.
+
+Change-Id: I86de4e09375619819cec25a88530db8b7a6ebbfd
+
2012-06-28 Petr Mladek <pmla...@suse.cz>
[463a08ede2787ecfc1cdb823466989178eca933b]
Version 3.5.4.6 (SUSE 3.5-rc2), tag suse-3.5.4.6
++++++ libreoffice-help-en-US.spec.in ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:05.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:05.000000000 +0200
@@ -18,7 +18,7 @@
Name: libreoffice-help-en-US
@DO_NOT_EDIT_COMMENT@
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301
@@ -59,6 +59,7 @@
BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib
BuildRequires: pkg-config
+BuildRequires: procps
BuildRequires: unzip
BuildRequires: xorg-x11-devel
BuildRequires: zip
@@ -178,24 +179,46 @@
PARALLEL_BUILD=
BUILD_SCRIPT_FLAGS=
ncpus=
-# parallel build of modules; it makes sense on machines with more CPUs
-if test "%build_module_in_parallel" = "1" ; then
- ncpus=`grep ^processor /proc/cpuinfo | wc -l`
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor
/proc/cpuinfo | wc -l`"
+#
+# Parallel build settings ...
+BUILD_SCRIPT_FLAGS=
+# dmake does not work with more than 64 jobs
+lo_jobs="%{?jobs:%jobs}"
+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"
fi
-if test "%build_module_in_parallel" -gt "1" ; then
- ncpus=%build_module_in_parallel
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+# do not eat all memory
+lo_jobs_reduced=
+if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
+ if test `uname -i` = "x86_64" ; then
+ mem_per_process=300
+ else
+ mem_per_process=200
+ fi
+ 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"
+ test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the
parallel build at all becuse of memory limits"
fi
-if test -n "$ncpus" ; then
- PARALLEL_BUILD="--with-num-cpus=$ncpus"
- BUILD_SCRIPT_FLAGS="-P$ncpus"
+# finally set jobs
+PARALLEL_BUILD=
+if test -n "$lo_jobs" ; then
+ PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
+ BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
fi
-if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e
"/opt/icecream/bin/g++" ; then
- PARALLEL_BUILD="$PARALLEL_BUILD
- --with-gcc-speedup=icecream
- --with-max-jobs=%jobs"
- BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+# parallel build of modules
+# it makes sense on machines with more CPUs
+num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
+# again reduce to 64 CPUs because of dmake
+test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not
support more than 64 processes => reducing number of used cpus"
+# allow only 2 modules if there more jobs allowed in one module
+test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
+PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
+BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
+# using icecream
+if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+ PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
fi
%endif
# make sure that JAVA_HOME is set correctly
++++++ libreoffice-help-groupX.spec.in ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:05.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:05.000000000 +0200
@@ -18,7 +18,7 @@
Name: libreoffice-help-group@GROUP_NUMBER@
@DO_NOT_EDIT_COMMENT@
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301
@@ -71,6 +71,7 @@
BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib
BuildRequires: pkg-config
+BuildRequires: procps
BuildRequires: python-devel
BuildRequires: unzip
BuildRequires: xorg-x11-devel
@@ -154,24 +155,46 @@
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS
-DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
%endif
-# parallel build of modules; it makes sense on machines with more CPUs
-if test "%build_module_in_parallel" = "1" ; then
- ncpus=`grep ^processor /proc/cpuinfo | wc -l`
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor
/proc/cpuinfo | wc -l`"
+#
+# Parallel build settings ...
+BUILD_SCRIPT_FLAGS=
+# dmake does not work with more than 64 jobs
+lo_jobs="%{?jobs:%jobs}"
+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"
fi
-if test "%build_module_in_parallel" -gt "1" ; then
- ncpus=%build_module_in_parallel
- PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+# do not eat all memory
+lo_jobs_reduced=
+if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
+ if test `uname -i` = "x86_64" ; then
+ mem_per_process=300
+ else
+ mem_per_process=200
+ fi
+ 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"
+ test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the
parallel build at all becuse of memory limits"
fi
-if test -n "$ncpus" ; then
- PARALLEL_BUILD="--with-num-cpus=$ncpus"
- BUILD_SCRIPT_FLAGS="-P$ncpus"
+# finally set jobs
+PARALLEL_BUILD=
+if test -n "$lo_jobs" ; then
+ PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
+ BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
fi
-if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e
"/opt/icecream/bin/g++" ; then
- PARALLEL_BUILD="$PARALLEL_BUILD
- --with-gcc-speedup=icecream
- --with-max-jobs=%jobs"
- BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+# parallel build of modules
+# it makes sense on machines with more CPUs
+num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
+# again reduce to 64 CPUs because of dmake
+test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not
support more than 64 processes => reducing number of used cpus"
+# allow only 2 modules if there more jobs allowed in one module
+test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2"
+PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus"
+BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS"
+# using icecream
+if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+ PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream"
fi
%endif
# make sure that JAVA_HOME is set correctly
++++++ libreoffice-l10n.spec.in ++++++
--- /var/tmp/diff_new_pack.70wmoF/_old 2012-07-14 20:33:05.000000000 +0200
+++ /var/tmp/diff_new_pack.70wmoF/_new 2012-07-14 20:33:05.000000000 +0200
@@ -18,7 +18,7 @@
@DO_NOT_EDIT_COMMENT@
Name: libreoffice-l10n
-Version: 3.5.4.6
+Version: 3.5.4.7
Release: 0
%define piece l10n
%define ooo_home libreoffice
++++++ libreoffice-translations-3.5.4.6.tar.bz2 ->
libreoffice-translations-3.5.4.7.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-3.5.4.6.tar.bz2
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-3.5.4.7.tar.bz2
differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
