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

Accepting request 921814 from LibreOffice:7.2

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/921814
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=979
This commit is contained in:
Danilo Spinella 2021-10-01 08:23:06 +00:00 committed by Git OBS Bridge
parent 2a4cf52b33
commit 2721e33845
6 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boost_1_71_0.tar.xz
View File

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

3
boost_1_75_0.tar.xz Normal file
View File

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

11
libreoffice.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Sep 24 13:39:16 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Add vendored poppler to use for all codestreams except Tumbleweed.
-------------------------------------------------------------------
Thu Sep 23 11:45:36 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Use vendored boost for all codestreams except Tumbleweed.
Update boost vendored version.
-------------------------------------------------------------------
Tue Sep 14 10:26:02 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

28
libreoffice.spec
View File

@ -217,8 +217,6 @@ BuildRequires: pkgconfig(mdds-1.5) >= 1.5.0
BuildRequires: pkgconfig(mythes)
BuildRequires: pkgconfig(nspr) >= 4.8
BuildRequires: pkgconfig(nss) >= 3.9.3
BuildRequires: pkgconfig(poppler) >= 21.01.0
BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(redland)
BuildRequires: pkgconfig(sane-backends)
@ -257,9 +255,21 @@ Obsoletes: %{name}-icon-theme-crystal < %{version}
Provides: %{name}-icon-theme-oxygen = %{version}
Obsoletes: %{name}-icon-theme-oxygen < %{version}
ExclusiveArch: aarch64 %{ix86} x86_64 ppc64le
%if 0%{?suse_version} < 1500
%if 0%{?suse_version} < 1550
# Too old boost on the system
Source2020: %{external_url}/boost_1_71_0.tar.xz
Source2020: %{external_url}/boost_1_75_0.tar.xz
Source2023: %{external_url}/poppler-21.01.0.tar.xz
Source2024: %{external_url}/poppler-data-0.4.10.tar.gz
%else
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_iostreams-devel
BuildRequires: libboost_locale-devel
BuildRequires: libboost_system-devel
BuildRequires: pkgconfig(poppler) >= 21.01.0
BuildRequires: pkgconfig(poppler-cpp)
%endif
%if 0%{?suse_version} < 1500
# Too old icu on the system
Source2021: %{external_url}/icu4c-68_1-src.tgz
Source2022: %{external_url}/icu4c-68_1-data.zip
@ -279,11 +289,6 @@ Requires(postun):update-desktop-files
%else
BuildRequires: gcc >= 7
BuildRequires: gcc-c++ >= 7
BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_iostreams-devel
BuildRequires: libboost_locale-devel
BuildRequires: libboost_system-devel
# genbrk binary is required
BuildRequires: icu
BuildRequires: java-devel >= 9
@ -1124,8 +1129,11 @@ export NOCONFIGURE=yes
%else
--disable-firebird-sdbc \
%endif
%if 0%{?suse_version} < 1500
%if 0%{?suse_version} < 1550
--without-system-boost \
--without-system-poppler \
%endif
%if 0%{?suse_version} < 1500
--without-system-icu \
%endif
--enable-evolution2 \

3
poppler-21.01.0.tar.xz Normal file
View File

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

3
poppler-data-0.4.10.tar.gz Normal file
View File

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