Accepting request 127844 from LibreOffice:Factory

Hi,

please, forward this into openSUSE-12.1 as well!

This 3rd RC includes some important fixes. It is going to be used for
the maintenance update (bnc#769793)

- 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

OBS-URL: https://build.opensuse.org/request/show/127844
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=37

libreoffice-binfilter-3.5.4.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f6f66caded6d82cdd0beac7d8b81d0d71dbbbf4b4543378259557e1f9c64dcc
-size 6451602

libreoffice-binfilter-3.5.4.7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b64af39594769bd424f5de753d6016109eaf160ff2305fb2814a25ad18c0469f
+size 6452781

libreoffice-branding-upstream.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@suse.com
+
+- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3)
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-branding-upstream.spec

@@ -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_build_version 3.5.4.7
-%define         lo_piece_version 3.5.4.6
+%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-core-3.5.4.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:789c185f563f983b7825c91b1149afa637ae207a35ad231b9d6039919ab32456
-size 128489280

libreoffice-core-3.5.4.7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1cac902e3f1fd24b0fb590f8acede7d5b34610bdefec52b9f3e00f97ff9cae67
+size 128344088

libreoffice-help-3.5.4.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a1841558df25e89371cea2b78fa847979320b4b444539a8d7862ba45304a125
-size 1882190

libreoffice-help-3.5.4.7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c44bc6b2fbfded9996765297a23902322990c0a7081d9fb8488bcf04de741eba
+size 1881488

libreoffice-help-en-US.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@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
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-help-en-US.spec

@@ -22,7 +22,7 @@ Name:           libreoffice-help-en-US
 ## 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:  openssl-devel
 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 @@ cd -
 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
+# Parallel build settings ...
-    ncpus=`grep ^processor /proc/cpuinfo | wc -l`
+BUILD_SCRIPT_FLAGS=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+# 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
+# do not eat all memory
-    ncpus=%build_module_in_parallel
+lo_jobs_reduced=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+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
-if test -n "$ncpus" ; then
+    max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
-    PARALLEL_BUILD="--with-num-cpus=$ncpus"
+    max_jobs="$(($max_mem / $mem_per_process))"
-    BUILD_SCRIPT_FLAGS="-P$ncpus"
+    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 "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+# finally set jobs
-    PARALLEL_BUILD="$PARALLEL_BUILD
+PARALLEL_BUILD=
-                    --with-gcc-speedup=icecream
+if test -n "$lo_jobs" ; then
-                    --with-max-jobs=%jobs"
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-  BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+  BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
+fi
+# 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-en-US.spec.in

@@ -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:  openssl-devel
 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 @@ cd -
 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
+# Parallel build settings ...
-    ncpus=`grep ^processor /proc/cpuinfo | wc -l`
+BUILD_SCRIPT_FLAGS=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+# 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
+# do not eat all memory
-    ncpus=%build_module_in_parallel
+lo_jobs_reduced=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+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
-if test -n "$ncpus" ; then
+    max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
-    PARALLEL_BUILD="--with-num-cpus=$ncpus"
+    max_jobs="$(($max_mem / $mem_per_process))"
-    BUILD_SCRIPT_FLAGS="-P$ncpus"
+    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 "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+# finally set jobs
-    PARALLEL_BUILD="$PARALLEL_BUILD
+PARALLEL_BUILD=
-                    --with-gcc-speedup=icecream
+if test -n "$lo_jobs" ; then
-                    --with-max-jobs=%jobs"
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-  BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+  BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
+fi
+# 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.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@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
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-help-group1.spec

@@ -22,7 +22,7 @@ Name:           libreoffice-help-group1
 ## 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:  openssl-devel
 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 @@ cd zip30
 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
+# Parallel build settings ...
-    ncpus=`grep ^processor /proc/cpuinfo | wc -l`
+BUILD_SCRIPT_FLAGS=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+# 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
+# do not eat all memory
-    ncpus=%build_module_in_parallel
+lo_jobs_reduced=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+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
-if test -n "$ncpus" ; then
+    max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
-    PARALLEL_BUILD="--with-num-cpus=$ncpus"
+    max_jobs="$(($max_mem / $mem_per_process))"
-    BUILD_SCRIPT_FLAGS="-P$ncpus"
+    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 "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+# finally set jobs
-    PARALLEL_BUILD="$PARALLEL_BUILD
+PARALLEL_BUILD=
-                    --with-gcc-speedup=icecream
+if test -n "$lo_jobs" ; then
-                    --with-max-jobs=%jobs"
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-  BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+  BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
+fi
+# 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.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@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
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-help-group2.spec

@@ -22,7 +22,7 @@ Name:           libreoffice-help-group2
 ## 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:  openssl-devel
 BuildRequires:  perl-Archive-Zip
 BuildRequires:  perl-Compress-Zlib
 BuildRequires:  pkg-config
+BuildRequires:  procps
 BuildRequires:  python-devel
 BuildRequires:  unzip
 BuildRequires:  xorg-x11-devel
@@ -295,24 +296,46 @@ cd zip30
 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
+# Parallel build settings ...
-    ncpus=`grep ^processor /proc/cpuinfo | wc -l`
+BUILD_SCRIPT_FLAGS=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+# 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
+# do not eat all memory
-    ncpus=%build_module_in_parallel
+lo_jobs_reduced=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+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
-if test -n "$ncpus" ; then
+    max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
-    PARALLEL_BUILD="--with-num-cpus=$ncpus"
+    max_jobs="$(($max_mem / $mem_per_process))"
-    BUILD_SCRIPT_FLAGS="-P$ncpus"
+    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 "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+# finally set jobs
-    PARALLEL_BUILD="$PARALLEL_BUILD
+PARALLEL_BUILD=
-                    --with-gcc-speedup=icecream
+if test -n "$lo_jobs" ; then
-                    --with-max-jobs=%jobs"
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-  BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+  BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
+fi
+# 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-group3.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@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
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-help-group3.spec

@@ -22,7 +22,7 @@ Name:           libreoffice-help-group3
 ## 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:  openssl-devel
 BuildRequires:  perl-Archive-Zip
 BuildRequires:  perl-Compress-Zlib
 BuildRequires:  pkg-config
+BuildRequires:  procps
 BuildRequires:  python-devel
 BuildRequires:  unzip
 BuildRequires:  xorg-x11-devel
@@ -334,24 +335,46 @@ cd zip30
 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
+# Parallel build settings ...
-    ncpus=`grep ^processor /proc/cpuinfo | wc -l`
+BUILD_SCRIPT_FLAGS=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+# 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
+# do not eat all memory
-    ncpus=%build_module_in_parallel
+lo_jobs_reduced=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+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
-if test -n "$ncpus" ; then
+    max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
-    PARALLEL_BUILD="--with-num-cpus=$ncpus"
+    max_jobs="$(($max_mem / $mem_per_process))"
-    BUILD_SCRIPT_FLAGS="-P$ncpus"
+    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 "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+# finally set jobs
-    PARALLEL_BUILD="$PARALLEL_BUILD
+PARALLEL_BUILD=
-                    --with-gcc-speedup=icecream
+if test -n "$lo_jobs" ; then
-                    --with-max-jobs=%jobs"
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-  BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+  BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
+fi
+# 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-group4.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@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
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-help-group4.spec

@@ -22,7 +22,7 @@ Name:           libreoffice-help-group4
 ## 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:  openssl-devel
 BuildRequires:  perl-Archive-Zip
 BuildRequires:  perl-Compress-Zlib
 BuildRequires:  pkg-config
+BuildRequires:  procps
 BuildRequires:  python-devel
 BuildRequires:  unzip
 BuildRequires:  xorg-x11-devel
@@ -268,24 +269,46 @@ cd zip30
 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
+# Parallel build settings ...
-    ncpus=`grep ^processor /proc/cpuinfo | wc -l`
+BUILD_SCRIPT_FLAGS=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+# 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
+# do not eat all memory
-    ncpus=%build_module_in_parallel
+lo_jobs_reduced=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+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
-if test -n "$ncpus" ; then
+    max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
-    PARALLEL_BUILD="--with-num-cpus=$ncpus"
+    max_jobs="$(($max_mem / $mem_per_process))"
-    BUILD_SCRIPT_FLAGS="-P$ncpus"
+    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 "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+# finally set jobs
-    PARALLEL_BUILD="$PARALLEL_BUILD
+PARALLEL_BUILD=
-                    --with-gcc-speedup=icecream
+if test -n "$lo_jobs" ; then
-                    --with-max-jobs=%jobs"
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-  BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+  BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
+fi
+# 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-group5.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@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
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-help-group5.spec

@@ -22,7 +22,7 @@ Name:           libreoffice-help-group5
 ## 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:  openssl-devel
 BuildRequires:  perl-Archive-Zip
 BuildRequires:  perl-Compress-Zlib
 BuildRequires:  pkg-config
+BuildRequires:  procps
 BuildRequires:  python-devel
 BuildRequires:  unzip
 BuildRequires:  xorg-x11-devel
@@ -322,24 +323,46 @@ cd zip30
 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
+# Parallel build settings ...
-    ncpus=`grep ^processor /proc/cpuinfo | wc -l`
+BUILD_SCRIPT_FLAGS=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+# 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
+# do not eat all memory
-    ncpus=%build_module_in_parallel
+lo_jobs_reduced=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+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
-if test -n "$ncpus" ; then
+    max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
-    PARALLEL_BUILD="--with-num-cpus=$ncpus"
+    max_jobs="$(($max_mem / $mem_per_process))"
-    BUILD_SCRIPT_FLAGS="-P$ncpus"
+    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 "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+# finally set jobs
-    PARALLEL_BUILD="$PARALLEL_BUILD
+PARALLEL_BUILD=
-                    --with-gcc-speedup=icecream
+if test -n "$lo_jobs" ; then
-                    --with-max-jobs=%jobs"
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-  BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+  BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
+fi
+# 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

@@ -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:  openssl-devel
 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 @@ cd zip30
 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
+# Parallel build settings ...
-    ncpus=`grep ^processor /proc/cpuinfo | wc -l`
+BUILD_SCRIPT_FLAGS=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+# 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
+# do not eat all memory
-    ncpus=%build_module_in_parallel
+lo_jobs_reduced=
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+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
-if test -n "$ncpus" ; then
+    max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"`
-    PARALLEL_BUILD="--with-num-cpus=$ncpus"
+    max_jobs="$(($max_mem / $mem_per_process))"
-    BUILD_SCRIPT_FLAGS="-P$ncpus"
+    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 "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+# finally set jobs
-    PARALLEL_BUILD="$PARALLEL_BUILD
+PARALLEL_BUILD=
-                    --with-gcc-speedup=icecream
+if test -n "$lo_jobs" ; then
-                    --with-max-jobs=%jobs"
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-  BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs"
+  BUILD_SCRIPT_FLAGS="-- -P$lo_jobs"
+fi
+# 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-icon-themes.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@suse.com
+
+- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3)
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-icon-themes.spec

@@ -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.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  9 17:06:28 UTC 2012 - pmladek@suse.com
+
+- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3)
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice-l10n.spec

@@ -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-l10n.spec.in

@@ -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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:850a14c267ee992f33f5a22854b0448cddb7de0b45a9ebb72866f418dd8ed92f
-size 140989774

libreoffice-translations-3.5.4.7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f04eb50d18d8bb2d067e741558a2332e54c7ec616f6cef25aadb84d6949214a1
+size 140989544

libreoffice.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Jul 13 10:37:51 UTC 2012 - pmladek@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 - pmladek@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
+
 -------------------------------------------------------------------
 Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com
 

libreoffice.spec

@@ -47,6 +47,7 @@ BuildRequires:  patch
 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 @@ BuildRequires:  cppunit-devel
 %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 @@ BuildRequires:  gst-plugins-base-devel
 # 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 @@ BuildRequires:  gst-plugins-base-devel
 # 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 @@ cd -
 %endif
 #
 # Parallel build settings ...
+# 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
+# finally set jobs
 PARALLEL_BUILD=
-if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then
+if test -n "$lo_jobs" ; then
-  PARALLEL_BUILD="--with-gcc-speedup=icecream
+  PARALLEL_BUILD="--with-max-jobs=$lo_jobs"
-                  --with-max-jobs=%jobs"
 fi
-# parallel build of modules; it makes sense on machines with more CPUs
+# parallel build of modules
-if test "%build_module_in_parallel" = "1" ; then
+# it makes sense on machines with more CPUs
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`"
+num_cpus=`grep ^processor /proc/cpuinfo | wc -l`
-fi
+# again reduce to 64 CPUs because of dmake
-if test "%build_module_in_parallel" -gt "1" ; then
+test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus"
-    PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel"
+# 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