Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-10-05 20:30:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-05 09:34:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-10-05 20:30:51.000000000 +0200 @@ -1,0 +2,36 @@ +Wed Oct 1 12:24:03 UTC 2014 - [email protected] + +- Fix the timestamp on docu (remove) +- Try to silence postinst warning during verfication +- Fix wrong obsolete lines + +------------------------------------------------------------------- +Mon Sep 29 13:54:08 UTC 2014 - [email protected] + +- Disable mergedlibs for now as it is not tested enough and broke +- Added patch: + * libreoffice-mergedlibs-circular-deps.patch + +------------------------------------------------------------------- +Sat Sep 27 15:46:43 UTC 2014 - [email protected] + +- Remove configure warning + +------------------------------------------------------------------- +Sat Sep 27 15:38:07 UTC 2014 - [email protected] + +- Version bump to 4.3.2.2: + * Various small bugfixes found from 4.3.1 + +------------------------------------------------------------------- +Fri Sep 19 13:53:23 UTC 2014 - [email protected] + +- Try to handle collada coinmp and gltf properly. + +------------------------------------------------------------------- +Fri Sep 19 11:11:42 UTC 2014 - [email protected] + +- Do not remove folders too early in the link-to-ooo-home + * this fixes warning about trying to remove dir + +------------------------------------------------------------------- Old: ---- libreoffice-4.3.1.2.tar.xz libreoffice-help-4.3.1.2.tar.xz libreoffice-translations-4.3.1.2.tar.xz New: ---- libreoffice-4.3.2.2.tar.xz libreoffice-help-4.3.2.2.tar.xz libreoffice-mergedlibs-circular-deps.patch libreoffice-translations-4.3.2.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.C0v5kv/_old 2014-10-05 20:31:00.000000000 +0200 +++ /var/tmp/diff_new_pack.C0v5kv/_new 2014-10-05 20:31:00.000000000 +0200 @@ -29,10 +29,10 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.3.1/ +%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.3.2/ # This is used due to the need for beta releases Name: libreoffice -Version: 4.3.1.2 +Version: 4.3.2.2 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C @@ -88,6 +88,8 @@ # LO never worked well with it Patch13: jvmfwk-disable-gcj.diff Patch14: libreoffice-4.3.0.3-themes-symlinks.patch +# Mergedlibs are broken as they circdep on each other +Patch15: libreoffice-mergedlibs-circular-deps.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: ImageMagick @@ -147,6 +149,7 @@ BuildRequires: libfonts BuildRequires: libformula BuildRequires: libfreehand-devel +BuildRequires: libgltf-devel BuildRequires: libicu-devel BuildRequires: libkde4-devel BuildRequires: liblangtag-devel @@ -649,7 +652,7 @@ fi \ \ %postun %{1} \ -if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt ]; then \ +if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt -a -f %{_datadir}/libreoffice/link-to-ooo-home ]; then \ %{_datadir}/libreoffice/link-to-ooo-home --unlink %{_datadir}/libreoffice/%{1}_list.txt || true \ rm -f %{_datadir}/libreoffice/%{1}_list.txt 2> /dev/null || true \ fi \ @@ -748,7 +751,7 @@ } \ %{-p: \ Provides: %{name}-help-%{-p*} = %{version} \ -Obsoletes: %{name}-help-%{-p*} = %{version} \ +Obsoletes: %{name}-help-%{-p*} < %{version} \ } \ } \ \ @@ -861,10 +864,15 @@ %patch12 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} +# Do not generate doxygen timestamp +echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile +echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile + %build # Parallel build settings ... lo_jobs="%{?jobs:%{jobs}}" @@ -950,7 +958,7 @@ --enable-release-build \ --enable-split-app-modules \ --enable-split-opt-features \ - --enable-mergelibs \ + --disable-mergelibs \ --enable-cairo-canvas \ --enable-graphite \ --enable-largefile \ @@ -991,9 +999,11 @@ --enable-neon \ --with-system-ucpp \ --disable-ccache \ - --disable-gltf \ - --disable-coinmp -# gltf and coinmp disabled until possible to use external pkgs + --enable-gltf --with-system-libgltf \ + --disable-coinmp \ + --disable-collada +# disable collada as we can't use system libs yet +# no coinormp packages for coinmp # hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701) sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py scripting/source/pyprov/officehelper.py ++++++ libreoffice-4.3.1.2.tar.xz -> libreoffice-4.3.2.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.3.1.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.3.2.2.tar.xz differ: char 25, line 1 ++++++ libreoffice-help-4.3.1.2.tar.xz -> libreoffice-help-4.3.2.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-4.3.1.2/ChangeLog-helpcontent2 new/libreoffice-4.3.2.2/ChangeLog-helpcontent2 --- old/libreoffice-4.3.1.2/ChangeLog-helpcontent2 2014-08-26 06:19:53.000000000 +0200 +++ new/libreoffice-4.3.2.2/ChangeLog-helpcontent2 2014-09-16 22:56:37.000000000 +0200 @@ -1,22 +1,28 @@ -2014-08-26 Christian Lohmaier <[email protected]> [1e90750d571b9bd084703d212d83315581d1e826] +2014-09-16 Robinson Tryon <[email protected]> [4f159d6438b2a67b702cea222fa1da53ac8c9a0f] -Version 4.3.1.2, tag libreoffice-4.3.1.2 +Version\ 4.3.2.2\,\ tag\ libreoffice-4.3.2.2 -Change-Id: I0f53d7787076c0a62b8682eda6f30e933d171717 -2014-08-06 Christian Lohmaier <[email protected]> [3a76025dab71c913dd6058e2a8b4bc48ba4cbb69] +2014-09-16 Robinson Tryon <[email protected]> [061e0eb475af1399d026d9886e5a320de6123805] -Branch libreoffice-4-3-1 + Branch libreoffice-4-3-2 -This is 'libreoffice-4-3-1' - the stable branch for the 4.3.1 release. -Only very safe changes, reviewed by three people are allowed. + This is 'libreoffice-4-3-2' - the stable branch for the 4.3.2 release. + Only very safe changes, reviewed by three people are allowed. -If you want to commit more complicated fix for the next 4.3.x release, -please use the 'libreoffice-4-3' branch. + If you want to commit more complicated fix for the next 4.3.x release, + please use the 'libreoffice-4-3' branch. -If you want to build something cool, unstable, and risky, use master. + If you want to build something cool, unstable, and risky, use master. -Change-Id: I9919ac7de62bce87e75845702108978d33f03cd1 +2014-08-21 Andras Timar <[email protected]> [888531eda1e60931d7bf6923710cea396de9166d] + +remove conditional text, because wiki conversion fails on it + +Change-Id: I184d58b0c58feee11010cd174e31641f4dc170ed +Reviewed-on: https://gerrit.libreoffice.org/11053 +Reviewed-by: David Tardon <[email protected]> +Tested-by: David Tardon <[email protected]> 2014-06-23 Andras Timar <[email protected]> [df7ec418465546ee71f8855a44759918b8f362db] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-4.3.1.2/helpcontent2/source/text/shared/guide/macro_recording.xhp new/libreoffice-4.3.2.2/helpcontent2/source/text/shared/guide/macro_recording.xhp --- old/libreoffice-4.3.1.2/helpcontent2/source/text/shared/guide/macro_recording.xhp 2014-08-26 06:07:39.000000000 +0200 +++ new/libreoffice-4.3.2.2/helpcontent2/source/text/shared/guide/macro_recording.xhp 2014-09-16 21:55:40.000000000 +0200 @@ -35,8 +35,6 @@ </bookmark> <paragraph role="heading" id="hd_id3093440" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="macro_recording"><link href="text/shared/guide/macro_recording.xhp" name="Recording a Macro">Recording a Macro</link> </variable></paragraph> -<switch select="appl"> -<case select="WRITER"><section id="macrorecorder"> <list type="ordered"> <listitem> <paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="4">Open the document for which you want to record a macro.</paragraph> @@ -92,14 +90,6 @@ </list> <embed href="text/shared/00/00000004.xhp#related"/> <paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="C"><link href="text/shared/01/06130000.xhp" name="Macro">Macro</link></paragraph> -<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="2"><link href="text/shared/main0600.xhp" name="macro programming in $[officename]">Programming in %PRODUCTNAME</link></paragraph><comment>how-to running a macro</comment><comment>how-to testing and debugging a macro</comment></section> -</case> -<case select="CALC"><embed href="text/shared/guide/macro_recording.xhp#macrorecorder"/> -</case> -<case select="BASIC"><embed href="text/shared/guide/macro_recording.xhp#macrorecorder"/> -</case> -<default> -<paragraph role="paragraph" id="par_id7797242" xml-lang="en-US" l10n="NEW">The macro recording functionality is only available for text documents in %PRODUCTNAME Writer and for spreadsheets in %PRODUCTNAME Calc.</paragraph> -</default> -</switch></body> +<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="2"><link href="text/shared/main0600.xhp" name="macro programming in $[officename]">Programming in %PRODUCTNAME</link></paragraph> +</body> </helpdocument> ++++++ libreoffice-mergedlibs-circular-deps.patch ++++++ From: Bjoern Michaelsen <[email protected]> Date: Tue, 23 Sep 2014 13:52:37 +0200 Subject: [PATCH] remove circular deps on mergedlibs - add dbtools to mergedlibs --- solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -112,6 +112,7 @@ gb_MERGEDLIBS := \ canvastools \ configmgr \ cppcanvas \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ deployment \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ -- 1.9.1 ++++++ libreoffice-translations-4.3.1.2.tar.xz -> libreoffice-translations-4.3.2.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.3.1.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.3.2.2.tar.xz differ: char 25, line 1 ++++++ link-to-ooo-home ++++++ --- /var/tmp/diff_new_pack.C0v5kv/_old 2014-10-05 20:31:02.000000000 +0200 +++ /var/tmp/diff_new_pack.C0v5kv/_new 2014-10-05 20:31:02.000000000 +0200 @@ -37,7 +37,7 @@ # first just remove the symlinks for file in `cat ${filelist} | grep "/usr/share/libreoffice" | sort`; do linkfile=${file/${datadir}/${libdir}} - if [[ -L "${linkfile}" && ! -r "${linkfile}" ]]; then + if [[ -L "${linkfile}" && ! -r "${linkfile}" && ! -d "${linkfile}" ]]; then rm -f "${linkfile}" || exit 1 fi done -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
