commit libreoffice for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
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 - tchvatal@suse.com
+
+- 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 - tchvatal@suse.com
+
+- 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 - tchvatal@suse.com
+
+- Remove configure warning
+
+-------------------------------------------------------------------
+Sat Sep 27 15:38:07 UTC 2014 - tchvatal@suse.com
+
+- Version bump to 4.3.2.2:
+ * Various small bugfixes found from 4.3.1
+
+-------------------------------------------------------------------
+Fri Sep 19 13:53:23 UTC 2014 - tchvatal@suse.com
+
+- Try to handle collada coinmp and gltf properly.
+
+-------------------------------------------------------------------
+Fri Sep 19 11:11:42 UTC 2014 - tchvatal@suse.com
+
+- 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
participants (1)
-
root@hilbert.suse.de