pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 253632 from LibreOffice:Factory

Browse Source 
- Fix the timestamp on docu (remove)
- Try to silence postinst warning during verfication
- Fix wrong obsolete lines

- Disable mergedlibs for now as it is not tested enough and broke
- Added patch:
  * libreoffice-mergedlibs-circular-deps.patch

- Remove configure warning

- Version bump to 4.3.2.2:
  * Various small bugfixes found from 4.3.1

- Try to handle collada coinmp and gltf properly.

- 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/request/show/253632
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=73
This commit is contained in:
Stephan Kulow 2014-10-05 18:30:34 +00:00 committed by Git OBS Bridge
commit d601be3adc
10 changed files with 88 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libreoffice-4.3.1.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a53d3af47d0fccf8b33de31c00158a89dc137a8edfe2b546c9c379f7822f3268
size 152392464

3
libreoffice-4.3.2.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e93d603a87d7feb04c1216ae988ea24618d88bd177ab3a3b2ad45b320749ffdc
size 152355836

3
libreoffice-help-4.3.1.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfb567c42a9943888454594b91ef587cc68c9825d974d6cd979f98a3a8fb1be0
size 1855104

3
libreoffice-help-4.3.2.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ff58a2daa91a6a51317c73869250697c0820dd6db6474893fd563d6599bb82e
size 1851688

24
libreoffice-mergedlibs-circular-deps.patch Normal file
View File

@ -0,0 +1,24 @@
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
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

3
libreoffice-translations-4.3.1.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:305db3543d78f1d5678cd894a91e886bb93bee951182a7201161b194f275416e
size 126692264

3
libreoffice-translations-4.3.2.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:519c2545e1c06d3e6df524489840ae9c8e281379c71f6cc6c7c7d62af182be40
size 126301100

36
libreoffice.changes
View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Fri Aug 29 13:29:59 UTC 2014 - tchvatal@suse.com

26
libreoffice.spec
View File

@ -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 @@ 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
@ -147,6 +149,7 @@ BuildRequires: libfbembed-devel
BuildRequires: libfonts
BuildRequires: libformula
BuildRequires: libfreehand-devel
BuildRequires: libgltf-devel
BuildRequires: libicu-devel
BuildRequires: libkde4-devel
BuildRequires: liblangtag-devel
@ -649,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 \
@ -748,7 +751,7 @@ Obsoletes: %{name}-help-%{-L*} < %{version} \
} \
%{-p: \
Provides: %{name}-help-%{-p*} = %{version} \
Obsoletes: %{name}-help-%{-p*} = %{version} \
Obsoletes: %{name}-help-%{-p*} < %{version} \
} \
} \
\
@ -861,10 +864,15 @@ Provides additional %{langname} translations and resources for %{project}. \
%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 @@ 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 \
@ -991,9 +999,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 \
--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

2
link-to-ooo-home
View File

@ -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