Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2015-02-20 12:42:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2015-02-03 11:39:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2015-02-20 12:42:48.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Feb 10 12:49:37 UTC 2015 - [email protected] + +- Reduce bit the compilation preparations as we prepped most of the + things by _constraints and it is no longer needed + +------------------------------------------------------------------- +Mon Feb 9 18:00:17 UTC 2015 - [email protected] + +- %pre is not enough the script needs to be rewritten in lua + +------------------------------------------------------------------- +Mon Feb 9 10:26:08 UTC 2015 - [email protected] + +- Move removal of obsolete dirs from %pretrans to %pre bnc#916181 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.HC1ib1/_old 2015-02-20 12:42:53.000000000 +0100 +++ /var/tmp/diff_new_pack.HC1ib1/_new 2015-02-20 12:42:53.000000000 +0100 @@ -859,10 +859,10 @@ # Parallel build settings ... lo_jobs="%{?jobs:%{jobs}}" %ifarch %{arm} -%if ! 0%{?qemu_user_space_build:1} -# native hardware is not that powerful -lo_jobs="1" -%endif + %if ! 0%{?qemu_user_space_build:1} + # native hardware is not that powerful + lo_jobs="1" + %endif %endif # do not eat all memory echo "Available memory:" @@ -870,40 +870,22 @@ echo "System limits:" ulimit -a lo_jobs_reduced= -if test -e "%{_libexecdir}/icecc/bin/gcc" -a -e "%{_libexecdir}/icecc/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --enable-icecream" -else - if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then - if test `uname -i` = "x86_64" ; then - mem_per_process=1000 - else - mem_per_process=800 - fi - %if 0%{?qemu_user_space_build:1} +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then mem_per_process=1200 - %endif max_mem=`LANG=C free -t -m | sed -n "s|^Mem: *\([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=1 && echo "Warning: Do not use the parallel build at all becuse of memory limits" - fi fi # finally set jobs PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-parallelism=$lo_jobs" fi -# using icecream # make sure that JAVA_HOME is set correctly source %{_sysconfdir}/profile.d/alljava.sh # use RPM_OPT_FLAGS, ... -# FIXME: use -g1 instead of -g; the .o files need about 12GB disk space with full debugging symbols; there is not enough disk space and not enough memory for linking libmerged on the build hosts -# 12.3 has broken cppconnector with wrong incude paths -%if 0%{?suse_version} == 01230 -ARCH_FLAGS="`echo %{optflags} | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing -I%{_includedir}/mysql-connector/ " -%else -ARCH_FLAGS="`echo %{optflags} | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing" -%endif +ARCH_FLAGS="%{optflags}" CFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
