From ee8bc8f5c26c33d814a8dde0f99a97c1c65a4f920b690766e2ed18764bbdf6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 Sep 2014 11:12:26 +0000 Subject: [PATCH 1/7] - Do not remove folders too early in the link-to-ooo-home * this fixes warning about trying to remove dir OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=190 --- libreoffice.changes | 6 ++++++ link-to-ooo-home | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 54945fc..9ea0574 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Fri Aug 29 13:29:59 UTC 2014 - tchvatal@suse.com diff --git a/link-to-ooo-home b/link-to-ooo-home index 298666d..a20ae44 100644 --- a/link-to-ooo-home +++ b/link-to-ooo-home @@ -37,7 +37,7 @@ change_linking() { # 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 From 0bf0896ea03371a06ba888d062a0d2a00cfff4f9504a0228407db1dc5d2743f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 Sep 2014 13:53:43 +0000 Subject: [PATCH 2/7] - Try to handle collada coinmp and gltf properly. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=191 --- libreoffice.changes | 5 +++++ libreoffice.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 9ea0574..a3fddbb 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 99d26d2..4e0c220 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -147,6 +147,7 @@ BuildRequires: libfbembed-devel BuildRequires: libfonts BuildRequires: libformula BuildRequires: libfreehand-devel +BuildRequires: libgltf-devel BuildRequires: libicu-devel BuildRequires: libkde4-devel BuildRequires: liblangtag-devel @@ -991,9 +992,11 @@ export NOCONFIGURE=yes --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 --with-system-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 From bda486e52e7fa24d940d923de3df153115b1d97f5e9a9c843dc8a438d9cdc9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 27 Sep 2014 15:39:07 +0000 Subject: [PATCH 3/7] - Version bump to 4.3.2.2: * Various small bugfixes found from 4.3.1 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=192 --- libreoffice-4.3.1.2.tar.xz | 3 --- libreoffice-4.3.2.2.tar.xz | 3 +++ libreoffice-help-4.3.1.2.tar.xz | 3 --- libreoffice-help-4.3.2.2.tar.xz | 3 +++ libreoffice-translations-4.3.1.2.tar.xz | 3 --- libreoffice-translations-4.3.2.2.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 4 ++-- 8 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 libreoffice-4.3.1.2.tar.xz create mode 100644 libreoffice-4.3.2.2.tar.xz delete mode 100644 libreoffice-help-4.3.1.2.tar.xz create mode 100644 libreoffice-help-4.3.2.2.tar.xz delete mode 100644 libreoffice-translations-4.3.1.2.tar.xz create mode 100644 libreoffice-translations-4.3.2.2.tar.xz diff --git a/libreoffice-4.3.1.2.tar.xz b/libreoffice-4.3.1.2.tar.xz deleted file mode 100644 index 09fbc65..0000000 --- a/libreoffice-4.3.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a53d3af47d0fccf8b33de31c00158a89dc137a8edfe2b546c9c379f7822f3268 -size 152392464 diff --git a/libreoffice-4.3.2.2.tar.xz b/libreoffice-4.3.2.2.tar.xz new file mode 100644 index 0000000..177f4f6 --- /dev/null +++ b/libreoffice-4.3.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e93d603a87d7feb04c1216ae988ea24618d88bd177ab3a3b2ad45b320749ffdc +size 152355836 diff --git a/libreoffice-help-4.3.1.2.tar.xz b/libreoffice-help-4.3.1.2.tar.xz deleted file mode 100644 index 3ee7613..0000000 --- a/libreoffice-help-4.3.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfb567c42a9943888454594b91ef587cc68c9825d974d6cd979f98a3a8fb1be0 -size 1855104 diff --git a/libreoffice-help-4.3.2.2.tar.xz b/libreoffice-help-4.3.2.2.tar.xz new file mode 100644 index 0000000..b697524 --- /dev/null +++ b/libreoffice-help-4.3.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ff58a2daa91a6a51317c73869250697c0820dd6db6474893fd563d6599bb82e +size 1851688 diff --git a/libreoffice-translations-4.3.1.2.tar.xz b/libreoffice-translations-4.3.1.2.tar.xz deleted file mode 100644 index 38aa215..0000000 --- a/libreoffice-translations-4.3.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:305db3543d78f1d5678cd894a91e886bb93bee951182a7201161b194f275416e -size 126692264 diff --git a/libreoffice-translations-4.3.2.2.tar.xz b/libreoffice-translations-4.3.2.2.tar.xz new file mode 100644 index 0000000..1dd3aa9 --- /dev/null +++ b/libreoffice-translations-4.3.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:519c2545e1c06d3e6df524489840ae9c8e281379c71f6cc6c7c7d62af182be40 +size 126301100 diff --git a/libreoffice.changes b/libreoffice.changes index a3fddbb..02837d1 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 4e0c220..1db0312 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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 From 6c24e28541023093c2f5239855104cd76cf7bffd8faced1c2277dc178befd43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 27 Sep 2014 15:46:59 +0000 Subject: [PATCH 4/7] - Remove configure warning OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=193 --- libreoffice.changes | 5 +++++ libreoffice.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 02837d1..c519ba1 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 1db0312..2c63b31 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -993,7 +993,7 @@ export NOCONFIGURE=yes --with-system-ucpp \ --disable-ccache \ --enable-gltf --with-system-libgltf \ - --disable-coinmp --with-system-coinmp \ + --disable-coinmp \ --disable-collada # disable collada as we can't use system libs yet # no coinormp packages for coinmp From 7b8a533c5d737c7d177f23614890d44ef55edf2e12921cced1566280030c67a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 29 Sep 2014 13:55:21 +0000 Subject: [PATCH 5/7] - Disable mergedlibs for now as it is not tested enough and broke - Add patch: * libreoffice-mergedlibs-circular-deps.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=194 --- libreoffice-mergedlibs-circular-deps.patch | 24 ++++++++++++++++++++++ libreoffice.changes | 5 +++++ libreoffice.spec | 5 ++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 libreoffice-mergedlibs-circular-deps.patch diff --git a/libreoffice-mergedlibs-circular-deps.patch b/libreoffice-mergedlibs-circular-deps.patch new file mode 100644 index 0000000..2b3b263 --- /dev/null +++ b/libreoffice-mergedlibs-circular-deps.patch @@ -0,0 +1,24 @@ +From: Bjoern Michaelsen +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 + diff --git a/libreoffice.changes b/libreoffice.changes index c519ba1..54d3c43 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 29 13:54:08 UTC 2014 - tchvatal@suse.com + +- Disable mergedlibs for now as it is not tested enough and broke + ------------------------------------------------------------------- Sat Sep 27 15:46:43 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 2c63b31..cd86d50 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -88,6 +88,8 @@ 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 +# 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 @@ -862,6 +864,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch12 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} @@ -951,7 +954,7 @@ export NOCONFIGURE=yes --enable-release-build \ --enable-split-app-modules \ --enable-split-opt-features \ - --enable-mergelibs \ + --disable-mergelibs \ --enable-cairo-canvas \ --enable-graphite \ --enable-largefile \ From 7cac346f1247776dc99beb4944990098915537e7e016df7a08a0bce4d89ee28e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 1 Oct 2014 12:25:02 +0000 Subject: [PATCH 6/7] - Fix the timestamp on docu (remove) - Try to silence postinst warning during verfication - Fix wrong obsolete lines OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=195 --- libreoffice.changes | 7 +++++++ libreoffice.spec | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 54d3c43..ca21854 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index cd86d50..9b478d7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -652,7 +652,7 @@ if [ -f %{_datadir}/libreoffice/%{1}_list.txt ] ; then \ 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 \ @@ -751,7 +751,7 @@ Obsoletes: %{name}-help-%{-L*} < %{version} \ } \ %{-p: \ Provides: %{name}-help-%{-p*} = %{version} \ -Obsoletes: %{name}-help-%{-p*} = %{version} \ +Obsoletes: %{name}-help-%{-p*} < %{version} \ } \ } \ \ @@ -869,6 +869,10 @@ Provides additional %{langname} translations and resources for %{project}. \ # 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}}" From 047569880cad92756b49d5a75c3f69b063fe7ac5219d6713d127ac16e66a3b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Oct 2014 13:21:00 +0000 Subject: [PATCH 7/7] - Added patch: * libreoffice-mergedlibs-circular-deps.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=196 --- libreoffice.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index ca21854..7e33cf7 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -9,6 +9,8 @@ Wed Oct 1 12:24:03 UTC 2014 - tchvatal@suse.com 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