Accepting request 1200688 from LibreOffice:Factory

- Use system cmis where feasible, as our RPM version of cmis-devel has been
  patched to work with Boost 1.86, which LibreOffice also uses.
- Update to 24.8.1.2 (jsc#PED-10362):
  * This release already includes the fix for CVE-2024-5261 (bsc#1226975)
    upstream.
  * Release notes:
    https://wiki.documentfoundation.org/Releases/24.8.1/RC1
    https://wiki.documentfoundation.org/Releases/24.8.1/RC2
- Update bundled dependencies:
  * curl 8.9.0 -> 8.9.1
  * poppler 24.06.0 -> 24.08.0

OBS-URL: https://build.opensuse.org/request/show/1200688
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=298
This commit is contained in:
Ana Guerrero 2024-09-13 12:25:29 +00:00 committed by Git OBS Bridge
commit 742736303b
18 changed files with 88 additions and 71 deletions

View File

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

BIN
curl-8.9.1.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAma1M1wACgkQ9DSh76/u
rqONlg//bGo6O1y56ddR424Z7Ptpu0RCp28YwndzmrDq5BPaPNJeW7tJSebRdYsH
UY5+F3DippF1RN6WAL0OK0d0XR/zdZqbO9x2RuAnTrr8rxwxVDSuQ3gbkGnSAMJ1
bvQ9i92yIf6A7/QqOFea2+6UJpzoSbLprSkXMUkbpH8p9BUvPgmRLC5GhrbcmjAb
304BNIERUQcycfB3ej09l7ybFF7lMd5X75Nu0+LemMxHFjo9urTa2UC2dZl3hqTg
bFnwa0Adea/DX2s69uwPmLicpvu9/AkmG0E1expfxQixLf4bY3i4sPxYdGF69WCp
Khyvc1wRMfLDnadO8PXhQHpBRt0caVr9FzTpvzsdXt+OxI6RqXjSkRD0ozvHTb73
VZiw+uOLgGYAfXJtkACreZlsWVOBOnRCorv7SbwZmu7QuWI5hSditw5tbKa8sD7x
q1P3y85JwMKFH6nyj0saQ5SxiISJKv9kcxHxXHdVqgPejKgAmMbsZESett1AwdzP
Yl06EENPWMV6KA2kNkEApmFl2e+LjzOyIm9ExTYdHCbbZZRIgzjo8/1l1KOJqDxB
4IvlmIE6dZ5/BCAa9Oz6XP607i8BTAwkBgpY1ihw2WVejGNUcM8JZf2as5WKb+1J
vZLlxlEnb5jSIigbRLvMV1phnrpr0tO4Nc/Q+seKfhLhihznrr4=
=STeL
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmbezu4ACgkQ9DSh76/u
rqPEGg/9HucmcuTW7Tadz/KPzq4oZEBhEmfwaDUETmEGNMkNUnNIHBCMNG6Z+ki7
1xca63pAT73h+X4Pi1lSlI8pdRIuMyLZsPSsavHfEYXKhgAx8DCnn83lihfGgGsb
Jx7fqBnqpwSPTXsrkTgX7HDSzlM1orIWTDwmMHRmZv8wKAp/qZQkx0wN+QfoKcQw
RWXcoMFj3IPkoVDHKhKcCLt1kuWHCkC2pxwuE97+jSJ9W+qzvtSQfKHgDt1PCmHc
UD2+Jfy+X4XG/u4Ry/qQrqStqEaWkmI3k+wKIa1B2pAjQMZRaEP8EJY1u84qNxvs
T5fdV60r7CFJOjvocQNfyzgvPWUEwdlmK5nXwMc6/+8TFrYprfen9RGlAzldtI30
6n6CRzU3PaSlOmiwOeSPTR6KzCFyfBNU/q3DBVCRL3c4BxDJK8f6xZHJSA8VCwuN
MMKqLVK2b9snFCuNRq+8/kn34X7xaTAb8J1eUVK9rfa5qU3v614xegBKJyQGENqU
2nPksI0XKSmYm29AJQBVgzRNhVbZG6xznk/3uWure6tCU0tXwfMoRK8B21AKI5Pq
lldBbUJejj7sDNWnVqk3IfG5xgdLrP/Y/uvCVKxd9Uwi/VqwprvOlU6AmxnwkGLS
kvQKsBVZ7gtQTDE82ISs2xibhwNtB7nPxNFjMSFUQWO4icgIn6M=
=ao64
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAma1M2cACgkQ9DSh76/u
rqNTyRAAlz0k1zVqXS5CwGXGUtv/Ub2u1+7NkAWNG7SvY3JMy8tZolNZkVf0EEw1
jvE/o7zjroXkJLj8mJgrFrnOtIlTvatbSTWqDO7zU3bGghsi1ZRKnm3sTu+hz5B/
qJ4n3eai03SFjhmGPPtltyYPPNiFS1CUIZgG29pp8ucu9PIcjCKctgRMYRgu1dot
8YMh+I07CmmLssb4yFny7AZsDvImfX4QOMarnuYTS2FfCWfQeydVkQhCoGzl7VLj
4Q5zrkkYPnapipI/QUWRSNm5DeU6Cc+kxOStgTM0COzrrqbbXe1ru5TRQHVzRFbL
Q6B4c/Bah8Xo1lS3zg/fp52dHprl8JFANHafvIuu7FdppDMnhNIx9sT0LJoHnH2m
icy7U5QLAdtMx0RBQPJ7u2ntWJjRPCIcSsBu8GY+VgqrfJzcRwtoku+V5GkJMU+2
DzTWvGhhuXoBZhrrmsIkQ6j4NmBm95/tMAjS/R8Y3aCBiR+U8EZ2PabeIPhmxUJA
SqhqBNw7DQ3lh2C/4xgZOpUOqfj/qbOP3sCQSiUc2K15MTZzKV1KBKgFM0oS/dkV
O+dkUEMgRdBbe+HdiyjAg0WnMK48FdegTTjB2hVy+pY8HSogZwEXU46xKnF63KR1
9UCftYveZxq49Kslr/CB3QIo94XRpVXFg64AcqkzNGhcWNyT7l0=
=rteW
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmbezvMACgkQ9DSh76/u
rqMjXA/8C0LEUd2RNdea+xn5wcGSRNkQebBu9gB8MSYa0/vvu0wT6lbMBZXAB6J6
O0O0fl/hhtGMGY63TiCm2RD0F8H9qJTYqPVJ2BbdRUjAuKhKNv3lbj7pQRsrdsd8
dhAdayRHCOI1plYE9edn6yltFzHAJpKYOkWveBLBypR6byh4QTXqnAdZfxJnXsoT
cQdnJ91DFz3KHxtVTLGdZyAaEztzjmkMacchP/X+XnBpIxtG/fo3zvBfY9t1j99c
jf0EIqqruAV5w0yrUBuUQg6HB8amlkYtPk2dwc9ZcAkrccTIXswicBsygvq5XDOW
mN0KQSRvNmMrZ6XnVlMiaOf2G8VDMnfC57f66E6LtV+3MF4g5KeYsqBOSQ3X/Js2
nsh2Dl9es06eoqwQTwezETV6ej4s+JGGvXf4GPJ+LbBUPm72GYA7ILlKW5e+e6Ri
9o5ZYPhixxcAAP7+8HYStzyDi/UimzxkqCuT5cky3XHw+lLgvrvqhoSTzmlWZIci
mtp9EINH02Fa1dcdG36QkFtHz72mdAXDKsamJKlPGgGN7fF4hpAbDej5NNApTwD2
wcMSMomfa0m7iU1LJ+KD/aOamdZhj/LgxiG41SbHttzja/3xeJoZB6SY9T5OAuuL
HrwWWJe3Jj/PEiXnUkma8GWkLsnYgCmwNacok8aZiwVnCJKWTrc=
=kJVJ
-----END PGP SIGNATURE-----

View File

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

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAma1M2cACgkQ9DSh76/u
rqMRGw//ZECPZxdP0C3wpCK/UeVN5L/qviy1PffX2uf+QtC5K6FnwfDzUXsUMNfM
KIgvvhA0DicHXCGLFVR/32P8xVjEcvQr577QyO0esIMVnUYI8pLwFO/as81InPOE
q4/ZpUcezofZw7lWFFexlTzZMqNTaSzk6sxNbJw6HGn/uQ4UINQU5noKa8YdXaWf
8umIGYXsO6D7Nc6Ktxsb4tQqQSLewD7A9bUZqZnV4o2IfMQpYNZCL/udDBdOrI+G
MeQUEOs3vi9zfLyo1Q0QWpHJS7OkrHt12UWLJRvCTkVzgzyEUjnnpyr6316UQxdL
YyxEYw1LE/Y8FOP2CcW/gqIIB69yvkp0mklm8MvLKoeOcwnsftwvX8RQBmsU/Gzo
UzzK3zcuLJWmgcUB4NqBibDm8LlTCK7CONWSvA3vvQaBvwPbArY0asAVIjCRigfd
EC9MNDGrgNSzzeIoi20rLTCUSeGJm47We/xM+iP0ob0tEH1Yx5nQWRRAbzfNFa8m
JTnY5NUU2vsyU5aoRQCCuyaZ4RPnlZfdYNfQEd/97PHSXmTJyppIOdMdcCcHN6oJ
mK+UPu3WQwCqcEEU+NwFk35mzFXo19yO+ezcxqSPNTS5qSXEYoIY7j2cgfWdemSp
o+tI5WMyJnoQ5pWShRYgHWH5zXgNn597/3oBqUSjNRG756Idqd8=
=18Ej
-----END PGP SIGNATURE-----

View File

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

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmbezvQACgkQ9DSh76/u
rqO0UA/8DMy4SMVzjm/nJNc2KAX+Ygae5uYpuT4++jepwQR/2gCr02nAYgIcJy8e
SDf9biu1yCjL47vsyuVj5iY/U5dguFhCkjhFU82VftUf3lH1lJqwL0cS9vRvhQrp
Cpzah3IdKb1nSOkQK95HOxnN1DD2e6g7xdo71K325juNcn3ITyiF2Y0eStDubnsz
vsV75wvCMagm28PKYjGNlb6NriElT6QCv+r4fxbQxbyTn3OdQ+dM01CWfNAct+9M
T+WtTRlOdVkPFtzOHFcVGeUPU8SarUOTO9LeeGdCURtyafFxDCphKlDqcyOQhRB0
5kJzVrcTe0+o2EE5qsuKiQbxDZj5nLyuIpdiy+9Wvbc06bZ5sKDwN3uTb7yUGA1D
tLgpryDlaNKm9D7DAXn4uH+Crm9SnzUoqKCE42lEtISWiILuCfeEUjdZOjEoJd3Q
HoFMeLV9gJ4e6TiGJp1+l94AVDSPzljt8xKqdZPYl9Rhp3PYSWYnwKlyexocFEsp
dSkytDTscKszq13vsLinyVyoN8Jm6scVWRQUSpx6SFQmHt8ODb3Rp/jFnFWa3Yvq
64s2ZjBegowWU1lkreNGNcv4fvFSeVEu+bkt47bL3knryehj/0KblmUr6MbbUFLG
AF+N7IVCnWouCQjr3LEzDsDiXdsWQZZmayOJcNLj2viXlBODhjY=
=dNaF
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Sep 12 12:53:09 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
- Use system cmis where feasible, as our RPM version of cmis-devel has been
patched to work with Boost 1.86, which LibreOffice also uses.
- Update to 24.8.1.2 (jsc#PED-10362):
* This release already includes the fix for CVE-2024-5261 (bsc#1226975)
upstream.
* Release notes:
https://wiki.documentfoundation.org/Releases/24.8.1/RC1
https://wiki.documentfoundation.org/Releases/24.8.1/RC2
- Update bundled dependencies:
* curl 8.9.0 -> 8.9.1
* poppler 24.06.0 -> 24.08.0
-------------------------------------------------------------------
Thu Aug 22 15:14:06 UTC 2024 - Fridrich Strba <fstrba@suse.com> Thu Aug 22 15:14:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Make the libassuan requirement more generic (bsc#1229103) - Make the libassuan requirement more generic (bsc#1229103)

View File

@ -78,7 +78,7 @@
%global with_gcc 12 %global with_gcc 12
%endif %endif
Name: libreoffice Name: libreoffice
Version: 24.8.0.3 Version: 24.8.1.2
Release: 0 Release: 0
Summary: A Free Office Suite (Framework) Summary: A Free Office Suite (Framework)
License: LGPL-3.0-or-later AND MPL-2.0+ License: LGPL-3.0-or-later AND MPL-2.0+
@ -112,8 +112,6 @@ Source2008: %{external_url}/pdfium-6425.tar.bz2
Source2009: %{external_url}/dtoa-20180411.tgz Source2009: %{external_url}/dtoa-20180411.tgz
# Skia is part of chromium and bundled everywhere as by google only way is monorepo way # Skia is part of chromium and bundled everywhere as by google only way is monorepo way
Source2010: %{external_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz Source2010: %{external_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
Source2012: %{external_url}/libcmis-0.6.2.tar.xz
Provides: bundled(libcmis) = 0.6.2
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build # to avoid BerkleyDB incompatibility with the plain build
Patch1: scp2-user-config-suse.diff Patch1: scp2-user-config-suse.diff
@ -154,8 +152,8 @@ BuildRequires: zxcvbn-devel
%if %{with system_curl} %if %{with system_curl}
BuildRequires: curl-devel >= 7.68.0 BuildRequires: curl-devel >= 7.68.0
%else %else
Source2013: %{external_url}/curl-8.9.0.tar.xz Source2013: %{external_url}/curl-8.9.1.tar.xz
Provides: bundled(curl) = 8.9.0 Provides: bundled(curl) = 8.9.1
%endif %endif
# Needed for tests # Needed for tests
BuildRequires: dejavu-fonts BuildRequires: dejavu-fonts
@ -303,18 +301,21 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version}
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550
# Too old boost on the system # Too old boost on the system
Source2020: %{external_url}/boost_1_85_0.tar.xz Source2020: %{external_url}/boost_1_85_0.tar.xz
Source2023: %{external_url}/poppler-24.06.0.tar.xz Source2023: %{external_url}/poppler-24.08.0.tar.xz
Source2024: %{external_url}/poppler-data-0.4.12.tar.gz Source2024: %{external_url}/poppler-data-0.4.12.tar.gz
Source2030: %{external_url}/tiff-4.6.0t.tar.xz Source2030: %{external_url}/tiff-4.6.0t.tar.xz
Provides: bundled(boost) = 1.85.0 Provides: bundled(boost) = 1.85.0
Provides: bundled(poppler) = 24.06.0 Provides: bundled(poppler) = 24.08.0
Provides: bundled(poppler-data) = 0.4.12 Provides: bundled(poppler-data) = 0.4.12
Source2031: %{external_url}/libcmis-0.6.2.tar.xz
Provides: bundled(libcmis) = 0.6.2
%else %else
BuildRequires: libboost_date_time-devel BuildRequires: libboost_date_time-devel
BuildRequires: libboost_filesystem-devel BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_iostreams-devel BuildRequires: libboost_iostreams-devel
BuildRequires: libboost_locale-devel BuildRequires: libboost_locale-devel
BuildRequires: libboost_system-devel BuildRequires: libboost_system-devel
BuildRequires: libcmis-devel
BuildRequires: pkgconfig(libtiff-4) >= 4.0.10 BuildRequires: pkgconfig(libtiff-4) >= 4.0.10
BuildRequires: pkgconfig(poppler) >= 21.01.0 BuildRequires: pkgconfig(poppler) >= 21.01.0
BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(poppler-cpp)
@ -1190,7 +1191,6 @@ export NOCONFIGURE=yes
--with-system-libpng \ --with-system-libpng \
--with-system-dragonbox \ --with-system-dragonbox \
--with-system-libfixmath \ --with-system-libfixmath \
--without-system-libcmis \
--with-vendor=SUSE \ --with-vendor=SUSE \
--with-lang=ALL \ --with-lang=ALL \
--disable-fetch-external \ --disable-fetch-external \
@ -1249,6 +1249,7 @@ export NOCONFIGURE=yes
--without-system-boost \ --without-system-boost \
--without-system-poppler \ --without-system-poppler \
--without-system-libtiff \ --without-system-libtiff \
--without-system-libcmis \
%endif %endif
%if 0%{?suse_version} < 1500 %if 0%{?suse_version} < 1500
--without-system-argon2 \ --without-system-argon2 \

View File

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

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

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