Hello community, here is the log from the commit of package OpenOffice_org-writer for openSUSE:Factory checked in at Fri Mar 19 09:11:07 CET 2010. -------- --- OpenOffice_org-writer/OpenOffice_org-writer.changes 2010-02-04 15:56:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org-writer/OpenOffice_org-writer.changes 2010-03-11 22:05:58.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Mar 11 21:18:47 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.99.1 (3.2.1-beta1) +- used the new solution to control parallel build; removed the obsolete hack + to check the available memory + +------------------------------------------------------------------- +Fri Feb 26 17:11:58 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.98.1 (3.2.1-alpha1) + +------------------------------------------------------------------- +Wed Feb 24 17:20:34 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.7 (3.2 bugfix release) + +------------------------------------------------------------------- +Thu Feb 18 20:46:24 CET 2010 - pmladek@suse.cz + +- updated ooo-build to version 3.2.0.6 (3.2 bugfix release) + +------------------------------------------------------------------- +Thu Feb 4 19:36:48 CET 2010 - pmladek@suse.cz + +- ooo-build-3.2.0.5 == 3.2-rc5 == final + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-writer.spec ++++++ --- /var/tmp/diff_new_pack.agOuhd/_old 2010-03-19 09:10:32.000000000 +0100 +++ /var/tmp/diff_new_pack.agOuhd/_new 2010-03-19 09:10:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-writer (Version 3.2.0.5) +# spec file for package OpenOffice_org-writer (Version 3.2.0.99.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-writer -Version: 3.2.0.5 +Version: 3.2.0.99.1 Release: 1 -%define ooo_build_version 3.2.0.5 +%define ooo_build_version 3.2.0.99.1 %define piece writer #!BuildIgnore: OpenOffice_org #!BuildIgnore: OpenOffice_org-filters-optional @@ -110,26 +110,13 @@ mv ooo/*/* . && rm -rf ooo %build -# reduce paralelism according to the available memory -jobs=%{?jobs:%jobs} -if test -n "$jobs" ; then -# define the limit per process in MB -%ifarch x86_64 - mem_per_process=1000 -%else - mem_per_process=500 -%endif - max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` - max_jobs="$(($max_mem / $mem_per_process))" - test $jobs -gt $max_jobs && jobs=$max_jobs && echo "Warning: Reducing number of parallel jobs to $max_jobs because of memory limits" - test $jobs -le 0 && jobs= && echo "Warning: Do not use the parallel build at all because of memory limits" -fi # setup env. export OO_INSTDIR=%{_libdir}/%ooo_home export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin export VERBOSE=1 -export EXTRA_BUILD_FLAGS="${jobs:+-P$jobs}" -export EXTRA_DMAKE_FLAGS="${jobs:+-- -P$jobs}" +export PIECE_BUILD_NCPUS_AUTO=1 +export PIECE_USE_JOBS="%{?jobs:%jobs}" +# FIXME: hack to avoid dependecy problem $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag || $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag || $OO_TOOLSDIR/piece/build-generic %piece %ooo_build_tag %install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org