Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2015-01-08 23:20:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-21 12:02:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2015-01-09 01:11:38.000000000 +0100 @@ -1,0 +2,41 @@ +Tue Jan 6 09:44:02 UTC 2015 - [email protected] + +- That verbose switch for configure was really really bad idea + +------------------------------------------------------------------- +Tue Jan 6 09:05:04 UTC 2015 - [email protected] + +- generic images.zip for galaxy icons seem gone so remove +- Do not supplement kde3 stuff, it is way beyond obsolete + +------------------------------------------------------------------- +Mon Jan 5 15:08:25 UTC 2015 - [email protected] + +- Remove vlc conditional +- korea.xcd is no more so remove +- Really use mergelib + +------------------------------------------------------------------- +Mon Jan 5 12:23:43 UTC 2015 - [email protected] + +- Disable telepathy, it really is experimental like hell + +------------------------------------------------------------------- +Sun Jan 4 15:51:42 UTC 2015 - [email protected] + +- Version bump to 4.4.0rc1: + * New 4.4 branch release with additional features +- Enable collada: + * New bundled collada2gltf tarball: + 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 +- Obsoleted patches: + * jvmfwk-disable-gcj.diff + * libreoffice-4.3-plasma5-ui-decisions.patch + * libreoffice-4.3.0.3-themes-symlinks.patch + * office-cfg-linux-common-template-dir.diff + * libreoffice-boost-1.56.patch +- Refreshed patches: + * officecfg-help-in-usr-share.diff + * system-pyuno.diff + +------------------------------------------------------------------- Old: ---- jvmfwk-disable-gcj.diff libreoffice-4.3-plasma5-ui-decisions.patch libreoffice-4.3.0.3-themes-symlinks.patch libreoffice-4.3.5.2.tar.xz libreoffice-boost-1.56.patch libreoffice-help-4.3.5.2.tar.xz libreoffice-translations-4.3.5.2.tar.xz office-cfg-linux-common-template-dir.diff New: ---- 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 libreoffice-4.4.0.1.tar.xz libreoffice-help-4.4.0.1.tar.xz libreoffice-translations-4.4.0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.PqD3EI/_old 2015-01-09 01:11:45.000000000 +0100 +++ /var/tmp/diff_new_pack.PqD3EI/_new 2015-01-09 01:11:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,12 +16,6 @@ # -# vlc is only on 13.1 and later and not for SLE -%if 0%{?suse_version} < 1310 -%bcond_with vlc -%else -%bcond_without vlc -%endif # List of supported langs, populated bellow in the lang macros %global langpack_langs %{nil} # extensions @@ -29,10 +23,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.5 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.4.0 # This is used due to the need for beta releases Name: libreoffice -Version: 4.3.5.2 +Version: 4.4.0.1 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 @@ -66,33 +60,23 @@ Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +# Currently not possible to unbundle, sucks +Source2006: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 # search help icons in %{_prefix}/share # FIXME: make it configurable in integrate into git -Patch3: officecfg-help-in-usr-share.diff +Patch0: officecfg-help-in-usr-share.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 -Patch5: scp2-user-config-suse.diff +Patch1: scp2-user-config-suse.diff # pack new desktop files -Patch6: pack-desktop-files-for-optional-filters.diff -# As the patch2 and usr share search is broken we can't do this anymore -# search libreoffice/share/template/common for language independent templates -# FIXME: make it configurable to push upstream -Patch9: office-cfg-linux-common-template-dir.diff +Patch2: pack-desktop-files-for-optional-filters.diff # correctly bootstrap python stuff with system python (deb#501028, i#90701) -Patch10: system-pyuno.diff +Patch3: system-pyuno.diff # do not use the broken help; unopkg complained about it when registering extensions # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files -Patch11: nlpsolver-no-broken-help.diff -Patch12: mediawiki-no-broken-help.diff -# LO never worked well with it -Patch13: jvmfwk-disable-gcj.diff -Patch14: libreoffice-4.3.0.3-themes-symlinks.patch -# PATCH-FIX-UPSTREAM: detect properly kde5 and allow kde4 ui there; will be in 4.4 series -Patch16: libreoffice-4.3-plasma5-ui-decisions.patch -# PATCH-FIX-UPSTREAM libreoffice-boost-1.56.patch -# http://cgit.freedesktop.org/libreoffice/core/commit/?id=45dfbdca6a9afba1a6aef21623ec025ded635a4d -Patch17: libreoffice-boost-1.56.patch +Patch4: nlpsolver-no-broken-help.diff +Patch5: mediawiki-no-broken-help.diff # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: ImageMagick @@ -165,6 +149,7 @@ BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: libodfgen-devel BuildRequires: liborcus-devel >= 0.7.0 +BuildRequires: libpagemaker-devel BuildRequires: libpoppler-devel BuildRequires: libredland-devel BuildRequires: librepository @@ -185,6 +170,7 @@ BuildRequires: mythes-devel BuildRequires: neon-devel BuildRequires: npapi-sdk +BuildRequires: openCOLLADA-devel BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: patch @@ -201,11 +187,11 @@ BuildRequires: rhino BuildRequires: sac BuildRequires: sane-backends-devel -BuildRequires: telepathy-glib-devel BuildRequires: ucpp BuildRequires: unixODBC-devel BuildRequires: unzip BuildRequires: vigra-devel +BuildRequires: vlc-devel BuildRequires: xml-commons-apis BuildRequires: xorg-x11 BuildRequires: xorg-x11-fonts @@ -240,9 +226,6 @@ Obsoletes: %{name}-ure < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 -%if %{with vlc} -BuildRequires: vlc-devel -%endif # we need a JRE for oobase and the other stuff %ifarch %{ix86} Recommends: jre-32 >= 1.6 @@ -297,7 +280,6 @@ Summary: Crystal LibreOffice Icon Theme (KDE3 default) License: LGPL-2.1 Group: Productivity/Office/Suite -Supplements: packageand(libreoffice:kdebase3-session) Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} @@ -812,7 +794,7 @@ %langpack -l ja -n Japanese -s cjk -T -X %langpack -l kk -n Kazakh %langpack -l kn -n Kannada -%langpack -l ko -n Korean -s cjk -T -c korea -X +%langpack -l ko -n Korean -s cjk -T -X %langpack -l lt -n Lithuanian -m lt_LT -X %langpack -l lv -n Latvian -m lv_LV %langpack -l mai -n Maithili @@ -859,17 +841,12 @@ %prep %setup -q -b1 -b2 +%patch0 -p1 +%patch1 +%patch2 -p1 %patch3 -p1 +%patch4 %patch5 -%patch6 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -%patch12 -%patch13 -p1 -%patch14 -p1 -%patch16 -p1 -%patch17 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} @@ -931,6 +908,10 @@ CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS +# Colada does not have .pc file and configure creator was really lazy +export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' +export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser' + # Whack in our python3 so we don't have to use internal one # which is quite nightmare. export PYTHON=%{_bindir}/python3 @@ -942,6 +923,7 @@ ./autogen.sh %configure \ $PARALLEL_BUILD \ + --enable-mergelibs \ --docdir=%{_docdir}/%{name} \ --with-compat-oowrappers \ --with-system-headers \ @@ -963,7 +945,6 @@ --enable-release-build \ --enable-split-app-modules \ --enable-split-opt-features \ - --disable-mergelibs \ --enable-cairo-canvas \ --enable-graphite \ --enable-largefile \ @@ -983,7 +964,7 @@ --with-doxygen \ --enable-gtk3 \ --enable-kde4 \ - --enable-gstreamer \ + --enable-gstreamer-1-0 \ --enable-evolution2 \ --enable-lockdown \ --enable-dbus \ @@ -995,22 +976,17 @@ --enable-ext-mariadb-connector \ --enable-scripting-beanshell \ --enable-scripting-javascript \ - --enable-telepathy \ - --enable-opengl \ -%if %{with vlc} --enable-vlc \ -%endif --enable-neon \ --with-system-ucpp \ --disable-ccache \ --enable-gltf --with-system-libgltf \ --disable-coinmp \ - --disable-collada -# disable collada as we can't use system libs yet + --enable-collada --with-system-opencollada # 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 +sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py # just call make here as we added the jobs in configure make build-nocheck @@ -1079,7 +1055,7 @@ %{buildroot}%{_libdir}/%{name}/program/resource/*.res \ %{buildroot}%{_libdir}/%{name}/share/config/images*.zip \ %{buildroot}%{_libdir}/%{name}/share/registry/{cjk,ctl}_*.xcd \ - %{buildroot}%{_libdir}/%{name}/share/registry/{korea,ctlseqcheck_th}.xcd \ + %{buildroot}%{_libdir}/%{name}/share/registry/ctlseqcheck_th.xcd \ ; do trg="`dirname "$i" | sed 's|%{_libdir}|%{_datadir}|'`" mkdir -p "$trg" @@ -1332,8 +1308,6 @@ %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_galaxy.zip -# other is just images.zip which seems to be almost identical -%{_datadir}/%{name}/share/config/images.zip %files icon-theme-hicontrast %defattr(-,root,root) ++++++ libreoffice-4.3.5.2.tar.xz -> libreoffice-4.4.0.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.3.5.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.4.0.1.tar.xz differ: char 25, line 1 ++++++ libreoffice-help-4.3.5.2.tar.xz -> libreoffice-help-4.4.0.1.tar.xz ++++++ ++++ 10880 lines of diff (skipped) ++++++ libreoffice-translations-4.3.5.2.tar.xz -> libreoffice-translations-4.4.0.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.3.5.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.4.0.1.tar.xz differ: char 25, line 1 ++++++ officecfg-help-in-usr-share.diff ++++++ --- /var/tmp/diff_new_pack.PqD3EI/_old 2015-01-09 01:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.PqD3EI/_new 2015-01-09 01:11:46.000000000 +0100 @@ -1,33 +1,35 @@ -diff -urN libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu ---- libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu 2013-12-30 11:24:13.235021217 +0100 -+++ libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu 2014-01-01 14:16:37.708042106 +0100 +Index: libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu +=================================================================== +--- libreoffice-4.4.0.1.orig/officecfg/registry/data/org/openoffice/Office/Paths.xcu ++++ libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -98,7 +98,7 @@ </node> <node oor:name="Help" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> -- <node oor:name="$(instpath)/help" oor:op="fuse"/> +- <node oor:name="$(instpath)/@LIBO_SHARE_HELP_FOLDER@" oor:op="fuse"/> + <node oor:name="/usr/share/help" oor:op="fuse"/> </node> </node> <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true"> -diff -urN libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs ---- libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2013-12-30 11:24:13.232021217 +0100 -+++ libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2014-01-01 14:16:37.710042106 +0100 -@@ -1613,7 +1613,7 @@ +Index: libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs +=================================================================== +--- libreoffice-4.4.0.1.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs ++++ libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs +@@ -1615,7 +1615,7 @@ <info> <desc>Specifies the path to the Office help files.</desc> </info> -- <value>$(instpath)/help</value> -+ <value>/usr/share/libreoffice/help</value> +- <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value> ++ <value>/usr/share/help</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false"> <info> -@@ -1808,7 +1808,7 @@ +@@ -1810,7 +1810,7 @@ <desc>Specifies the default directory where Office help files are located.</desc> </info> -- <value>$(instpath)/help</value> -+ <value>/usr/share/libreoffice/help</value> +- <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value> ++ <value>/usr/share/help</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false"> <info> ++++++ system-pyuno.diff ++++++ --- /var/tmp/diff_new_pack.PqD3EI/_old 2015-01-09 01:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.PqD3EI/_new 2015-01-09 01:11:46.000000000 +0100 @@ -27,9 +27,9 @@ import pyuno try: -diff -urN libreoffice-4.0.0.0.beta2.old/scripting/source/pyprov/officehelper.py libreoffice-4.0.0.0.beta2/scripting/source/pyprov/officehelper.py ---- libreoffice-4.0.0.0.beta2.old/scripting/source/pyprov/officehelper.py 2012-12-19 19:09:46.868989508 +0100 -+++ libreoffice-4.0.0.0.beta2/scripting/source/pyprov/officehelper.py 2012-12-19 19:10:21.810986269 +0100 +diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py +--- libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py 2012-12-19 19:09:46.868989508 +0100 ++++ libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py 2012-12-19 19:10:21.810986269 +0100 @@ -44,7 +44,7 @@ if "UNO_PATH" in os.environ: sOffice = os.environ["UNO_PATH"] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
