Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2013-08-04 07:59:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- libreoffice-help-en-US.changes: same change 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 libreoffice-icon-themes.changes: same change libreoffice-l10n.changes: same change --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2013-08-02 07:06:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2013-08-04 07:59:32.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Aug 1 14:46:22 UTC 2013 - [email protected] + +- set PYTHON variables using python-config on SLED11 because the pkg-config + files are not there +- set the PYTHON variables only in the main libreoffice.spec because + they are not needed to build help +- build-link-rt.diff: liblt is linked with librt, so we need to link + the libmerged with librt as well; it fixes the build on SLED11 +- use -g1 instead of -g to reduce the memory and disk usage with + debugging symbols; note that only .o files need about 12GB when + compliled with full debugging symbols + +------------------------------------------------------------------- New: ---- build-link-rt.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.B0Qala/_old 2013-08-04 07:59:39.000000000 +0200 +++ /var/tmp/diff_new_pack.B0Qala/_new 2013-08-04 07:59:39.000000000 +0200 @@ -257,4 +257,5 @@ %files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US %defattr(-,root,root) + %changelog 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: same change ++++++ libreoffice-l10n.spec ++++++ --- /var/tmp/diff_new_pack.B0Qala/_old 2013-08-04 07:59:39.000000000 +0200 +++ /var/tmp/diff_new_pack.B0Qala/_new 2013-08-04 07:59:39.000000000 +0200 @@ -1664,8 +1664,8 @@ PreReq: libreoffice >= 3.5 %endif Requires: libreoffice = %{version} -Provides: OpenOffice_org-sh-YU = %version Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res +Provides: OpenOffice_org-sh-YU = %version Obsoletes: OpenOffice_org-sh-YU < %version # compat stuff Provides: OpenOffice_org-sh = %{version} @@ -1752,8 +1752,8 @@ %endif Requires: libreoffice = %{version} Requires: scalable-font-ru -Provides: OpenOffice_org-sr-CS = %version Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res +Provides: OpenOffice_org-sr-CS = %version Obsoletes: OpenOffice_org-sr-CS < %version # compat stuff Provides: OpenOffice_org-sr = %{version} ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.B0Qala/_old 2013-08-04 07:59:40.000000000 +0200 +++ /var/tmp/diff_new_pack.B0Qala/_new 2013-08-04 07:59:40.000000000 +0200 @@ -594,6 +594,9 @@ # search help icons in /usr/share # FIXME: make it configurable in integrate into git Patch3: officecfg-help-in-usr-share.diff +# liblt is linked with librt, so we need to link the mergedlib with librt as well +# it fixes build on SLED11 +Patch4: build-link-rt.diff # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build # FIXME: make it configurable and push upstream @@ -1299,6 +1302,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 %patch5 %patch6 -p1 %patch7 -p1 @@ -1345,6 +1349,17 @@ %build %{expand:%(cat %_sourcedir/build_prepare.inc)} +# Whack in our python2 so we don't have to use internal one +# which is quite nightmare. +export PYTHON=/usr/bin/python +%if 0%{?suse_version} > 01130 +export PYTHON_CFLAGS=`pkg-config --cflags python` +export PYTHON_LIBS=`pkg-config --libs python` +%else +# pkg-config support is not available in the pyton package on SLED11 +export PYTHON_CFLAGS=`python-config --includes` +export PYTHON_LIBS=`python-config --libs` +%endif %if %prepare_build != 0 ./autogen.sh $PARALLEL_BUILD \ --libdir=%{_libdir} \ ++++++ build-link-rt.diff ++++++ --- Library_merged.mk.old 2013-07-23 12:40:26.000000000 +0200 +++ Library_merged.mk 2013-07-31 16:33:34.000000000 +0200 @@ -89,6 +89,7 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,merged,\ -lm \ -ldl \ + -lrt \ -lpthread \ )) endif ++++++ build_prepare.inc ++++++ --- /var/tmp/diff_new_pack.B0Qala/_old 2013-08-04 07:59:40.000000000 +0200 +++ /var/tmp/diff_new_pack.B0Qala/_new 2013-08-04 07:59:40.000000000 +0200 @@ -56,11 +56,12 @@ source /etc/profile.d/alljava.sh %endif # 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 $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing -I/usr/include/mysql-connector/ " +ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing -I/usr/include/mysql-connector/ " %else -ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g'` -fno-strict-aliasing" +ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-fexceptions//g' -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'` -fno-strict-aliasing" %endif CFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS" @@ -74,8 +75,3 @@ %if %suse_version < 1140 export PATH="$RPM_BUILD_DIR/libreoffice-%version/zip30:$PATH" %endif -# Whack in our python2 so we don't have to use internal one -# which is quite nightmare. -export PYTHON=/usr/bin/python -export PYTHON_CFLAGS=`pkg-config --cflags python` -export PYTHON_LIBS=`pkg-config --libs python` -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
