diff --git a/libcmis-0.5.2.tar.xz b/libcmis-0.5.2.tar.xz deleted file mode 100644 index b2d5822..0000000 --- a/libcmis-0.5.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2 -size 484404 diff --git a/libcmis-0.6.0.tar.xz b/libcmis-0.6.0.tar.xz new file mode 100644 index 0000000..6d2d9bf --- /dev/null +++ b/libcmis-0.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56df575f78dacc21b4cec7cec73d671fd235f7c2010a8bb7940ef1413dc899fd +size 487724 diff --git a/libreoffice-7.6.2.1.tar.xz b/libreoffice-7.6.2.1.tar.xz deleted file mode 100644 index 5a1ace7..0000000 --- a/libreoffice-7.6.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5d2733bd02ce24c30207795b77b9f5e2b5aba3a14773375fb5cc228ed2b9ca2 -size 280623380 diff --git a/libreoffice-7.6.2.1.tar.xz.asc b/libreoffice-7.6.2.1.tar.xz.asc deleted file mode 100644 index b6eac9b..0000000 --- a/libreoffice-7.6.2.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmUN54IACgkQ9DSh76/u -rqMh+w/6Ap1QIJ0sQ2daSgAQe0XCXfP3EzhbwvHt9X0eeSlzDxIthbvlW37Dl2Ym -zJcbvh4ORdqjzYAEyIj/hin2XVsexM+bwbHa2bJRPHdOhGVRG7cvRDMPlzt3Fe6G -SeM4pMmga08oid6uSnkrnIM3x4JQxFqOCTXQKZisw/ecBGqSkWGH30vzphJMTe0j -N/6ISHmVVTFaRSaE/eNloo79IJygmHJfDgYVtN/nU5EmDp+zrlx4ZczLhsShAIRs -+/B6ddiXeyL3WmN3Gawa5/usaVDA3KeXQVtpSXJKEnLUZNZWm8EnTVh/qZahleON -Osno3XoZAMwAuaCUi/I3vQgGVQPh22FfjQc30i8kLDX3wybMOXIvv5TqmmYWHdCL -PJwFwc4/zwvF8LOZdrq5jltGa2dYBpcVK9HH7DVNU5iARC/dOdF+DS3RqVKvJr8C -Q/IPRmFde/zkQkppfdOhiRNeyRW7wVOjZ2V/Ia4NwJ17G7a9msRgPFrycD1I//CN -7VbewJrr8A6cM2Sa2YD/vsOjJODzGSJHz3896ogTQEw3WeNrMFLTmQzLuWqn1AHa -OmPlpq95uzwEiHbadevgKk9SOOh1OHP1woUmXG7E/AddA31kaUp5Cj4dQeeIbrhz -erJZYt2/8oaVavoL8Pmu3udZuahxoMxR0BpdBI6FEiVIN7wZOlk= -=RxJu ------END PGP SIGNATURE----- diff --git a/libreoffice-7.6.3.1.tar.xz b/libreoffice-7.6.3.1.tar.xz new file mode 100644 index 0000000..dcf4c81 --- /dev/null +++ b/libreoffice-7.6.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0727572eee27e849cb5db15a864e867d8231d9669b77e00722e00ccc14410091 +size 281489892 diff --git a/libreoffice-7.6.3.1.tar.xz.asc b/libreoffice-7.6.3.1.tar.xz.asc new file mode 100644 index 0000000..408fb08 --- /dev/null +++ b/libreoffice-7.6.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmVEF/cACgkQ9DSh76/u +rqNCGQ/8Cn+NlbbxIU4YAYnqVMz4l2106nFtBI9slWtsFAkIX/oN5RARXe2Ujbn6 +mKd/xZS+9sT0i3t95k+YTpYSWmvBTznBn93Im/VGnH8TxJvKC0hTGR0RJ3askI1g +UMxokXTiVtj+yrArDwXw3mEwz1wMaOVOk0hHhP9GAeoFL6VxcN2rl3qvi/vgfHqp +bgTsOiZDMSW7dciW4ci/fc4AUVj5aQiI25xe6TRcUSS2l8yPH2YaxfyHEQGRzC6d +drFJz7uzgwdSKYeDJPzEcoq9GPMSaTOT9cObvfEsgQlCjRxkE4orzQ/sPWfkel2j +MHm11KiiTXqrB0vaHUcEvWeAW3vAwE2JmiCR9LnhWNgdSNTbDvGH1uZHd8a9tN3c +65xW4+4MJijJ1jwQ6AzEQkWhk51YaT2oxYUCdf6l41daCNOrSAi0HWzOewgKq+Tj +EQAQNXEmcS5hONM2P9tsEmUFKkAd82+NTYpCu0OgkTJXExam91UGrec1e95AT4Ey +29mfzY7qQzJaQeJPFSNgK3wxzUfq4l4AU1+9ob7LQKOfVYKR6VdGqVfAaskTBGcw +kto9le5vJLMzpNRYoEBDbFVktSRCbW0OvjPZVxmpXxt4KV30qdNsXdr9K4+NspTI +9s8mUIsFbOFrcwRZDRcvn0aAWug/LRqKFknuLpUGmYRrkOqXz4A= +=SnGX +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.6.2.1.tar.xz b/libreoffice-help-7.6.2.1.tar.xz deleted file mode 100644 index 5f59c4b..0000000 --- a/libreoffice-help-7.6.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6bdc27027a603031785d6c650785073add8d55872ab81a15067459ee1b6cd148 -size 166958512 diff --git a/libreoffice-help-7.6.2.1.tar.xz.asc b/libreoffice-help-7.6.2.1.tar.xz.asc deleted file mode 100644 index 1df0240..0000000 --- a/libreoffice-help-7.6.2.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmUN54oACgkQ9DSh76/u -rqP39A/8CM+w1yqCDieexEeC3ODqz/f9DeiEwLBy21pJQbcvNZotzUOGrfzSPIPd -nlV1WZqdMQ+AyxD5e80/yq5lI/QwhYdruuhrKF9rt14m4YPDp872/sfEcpqfzOzz -tXMdFlIw5xWOJ6uBjWcABuDEihChrSbuKeH6Tmy5UZt3aqZKyjKB0PBQtIiTmtG/ -ho3dHs68oAUTM9LcN2iAPa0SAjvpswjyxw/bA5W0SJqkg2Qty4PDGm+qydKR0iBY -zlnshmp68wq+nRTSGJCTRZEaXO9/D83+m9PnlLVUxJq60FPBqQoh/dJLbKkoYZkU -0rxDTIOdba2C6iFeALORsLekE2kwOhs5aZNbS2udapR5eB06y9VsugM3MUAgyD2X -8y/hpWKheVEfzgrNJHrZjmShas0WieQ+qfPIX0MMgFYOgUfSY6h/N5nSzmjZ5K+z -dZFKFexSmeDLD8ftbFPZJUHqZGWjbZ7XRvLPsFGrWUqqRg5BvDTwIWFZl9+84H1M -Mts+ydFr+2Wm85zFSSGLKMJCCv8k5elw7ch25UriXONjgVPD/RzSS/oF9Gaaf7Xy -cxpJDXrfhQCtv723B79bXZGoaTIQuuYxBV6rOqzz0nozO6asv3E6r1pbxJpZG6Gn -KDZhXnicY+GB7wKx3h1sHKbNB3XI+Fot1qN+yOQOYpZlwBWyF5s= -=2ze7 ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.6.3.1.tar.xz b/libreoffice-help-7.6.3.1.tar.xz new file mode 100644 index 0000000..2c244cf --- /dev/null +++ b/libreoffice-help-7.6.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c92ca634992716f3daa464027159281bca1fa487da4d8fc6f582645e630416e3 +size 166958340 diff --git a/libreoffice-help-7.6.3.1.tar.xz.asc b/libreoffice-help-7.6.3.1.tar.xz.asc new file mode 100644 index 0000000..e37f1ec --- /dev/null +++ b/libreoffice-help-7.6.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmVEF/8ACgkQ9DSh76/u +rqMV3hAAt78zOccsSRxjzYa9LedKPGBJ4zxJsnBD6uk+bGWimugFrRbnA8K2617M +SbZc2Us2yaRRp/tCVdtED0S14s2dcWTc6oveHbnKFtoMah2LqAT7iHsVt6Xnc4cO +V/gWuBD4h1sRSdTWNHVVYYhoRHaQ+zxnfU77NF6QPHOglOzV15K43aDbgjbgYAfs +BwFACS2OiwfasOlwiSsSx5X0unhDorPFnI1j1DXQ6mp1UyBLgYjaCrgM4xUsMxmC +cnn5u0xgAep+4i8wOiWQQhP6Uf8iQPIJLZQ4zV7Th3F0MoHhvItiGcZ+toV3zmbc +Gq8zGkj+9aCjsbGQ05zrlrLjWmZAf16pEPi83MA4M0IqyCM2Vk6G6li02XstXfqB ++6jmDkSoy54RN8BvmAqBu8aD9lvfu1xbRPZJtlZtjEQyWsfpR9Rl6grLsWoM3SZO +TpXQ9tbsEisoxmO7Rn83N/7h2pX4swxweWpYQ/8/EdUiCZ5I7XWAsex33gpaD0XV +HwoC5pX0mjw2fISTr0idpHtAb71NxygtPxwnaATH9lZQjByQPzFIHnJSoa8qnIYc +Y2zsVj2LsTBtL4JFO1a81uGM85pZSYe9lcb7DMZWHvWx6Fqu2fR7CSzEtwv90Lnf +nra9VEL/P+O2/FHrVBwLE1eXIPw48A7RNMA5xse19XUl0M3vh98= +=rhiM +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.6.2.1.tar.xz b/libreoffice-translations-7.6.2.1.tar.xz deleted file mode 100644 index dcfaa35..0000000 --- a/libreoffice-translations-7.6.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b239fa6127e87b00b7990a5edef96b1fa522f80c1d96e3f8749d95190f6d60a -size 216806496 diff --git a/libreoffice-translations-7.6.2.1.tar.xz.asc b/libreoffice-translations-7.6.2.1.tar.xz.asc deleted file mode 100644 index db167e0..0000000 --- a/libreoffice-translations-7.6.2.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmUN54oACgkQ9DSh76/u -rqMGHg//TdRzrfLvH0s1VOsvlFVriVY755GUi0e7l/6/TzTwxzg3RbncrhP4njSk -la+GOGU7y421Vq+Bm5SEo+quw0DdyL9HEQNwAEr/KOTlKW8TqfhFJBjHYCaExOyE -dv/UNDW4hLoIDgxsgvpSn4tSCyDHehZ3igb5l94uuzKWnV8Wp2+yjvddwcaB9z75 -RspcrttAYiazgwpw9rxelQWvKCTVa7JV9HNS68YCZtBnF/77gCQu3R/ZB3qJrcgd -94S5r0En61Da5ldAvDbJPCNYrn0I2Z+ZG/zZ5XR/7rSiK5EP+gwNGVBTTXb5UOL5 -piDHT9E3Wy/hMe9xNGuMovhMjs1MEkZUwmmFl/WuPb4egrjLCA0zVwQdd3cMdYrA -3lCfgMbb+gugJQ0G293GVtxPnP/hR5BTppqu9DJXxSsWE4Q9HEw/5Q3Tdx9TrZ9g -RringByNyjralzhsrFqoR9pAmtVuIUdq7sNAQGCwqqInRdOzfaDIXJkG0LmkacEQ -B1YaX9dHg+exzkGJXGrZ0jWnqTL/+9R5rvEDE4oAHqgE4xCM56Q35xY74Qqq2NRU -QvWzEmyKZeQ3gr1WnsV938Pa5R814y/eEH6EMJjYgXidqva0HjhwXESqcIpNY35D -RL7DQ7WSonxWzMNVgwQorMmHcOjyv4EYoz1yPEBLA+/skHzbuVw= -=8jRE ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.6.3.1.tar.xz b/libreoffice-translations-7.6.3.1.tar.xz new file mode 100644 index 0000000..f53d379 --- /dev/null +++ b/libreoffice-translations-7.6.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01dfcb8e4ddcda0f3964b5991bd528c31486b3d421355fff228d51e82b3c2fd1 +size 216909328 diff --git a/libreoffice-translations-7.6.3.1.tar.xz.asc b/libreoffice-translations-7.6.3.1.tar.xz.asc new file mode 100644 index 0000000..0a78b81 --- /dev/null +++ b/libreoffice-translations-7.6.3.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmVEGAAACgkQ9DSh76/u +rqPbFA//btC9oDoyePrLCjsYWmSeUHAsw8JAppY9Px+S0Flo5Ntnz9pVQC4r4eYA +7G5cZCSvgFK710L3zu/bb3O28BQjb/uUCNxL+984q8ldfK/qtvczOTCvdnOlQmua +HbxWsR5SqePjYEZ0cxCZ6m9X1X3YHMnbKELUktfXr149HnYwW5HZokkM/7OUJGGU +73ynUAARfsIig81sP18yEdPcZw99JR+aUHj8tkaNDpYLHjkUnQT2knnL4ddpxksH +SBG30CWQ9HQQ6eiiFt/L8gxnnwiWkTN/4niKm4STZ91VY0XHZP75AEQsVCBtDtVO +0GyCi7/zMpNVCXuDjNipeQ4q5W2I9ArcJW3dfNn12RJSdy0sohZRp+wOSR3GMdwl +qVik9Z45Y3YJph7ij+CcQwFmWkvPOfM5/aKAMY01Lz5jr5W8ydhSDSZzVyTpQGAK +3rGXDKohtCHOoSKcCfF9wnsFc+G7QuW2PV8bJ4VLVW6azIB9IZFNWlL63oRkWb+i +T46+FCYPtoCrKDTEXeAi7OKBAlIVIkGACN9RUYNhIQjmYPkr5G+xBABAo2WnsXTs +2A+7Yqfv+Jh5wvJ1tSTO8fQzfHAlSv6WtA6UhfhBsEvXgVOTDZeIjYqBuqnK0FqK +92guVN4bxUTkTyJdywRuJ9EWhIw+YkET1Q13zbBLOPUCCx8VHdw= +=4Z4k +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 5a858a8..e307731 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Nov 13 10:58:05 UTC 2023 - Danilo Spinella + +- Update to 7.6.3.1: + https://wiki.documentfoundation.org/Releases/7.6.3/RC1 + https://wiki.documentfoundation.org/Releases/7.6.2/RC2 +- Update bundled dependencies: + libcmis-0.5.2.tar.xz -> libcmis-0.6.0.tar.xz + poppler-23.06.0.tar.xz -> poppler-23.09.0.tar.xz + +------------------------------------------------------------------- +Thu Oct 26 08:58:30 UTC 2023 - Jan Engelhardt + +- Add bundled() markers + ------------------------------------------------------------------- Thu Oct 5 10:56:02 UTC 2023 - Danilo Spinella diff --git a/libreoffice.spec b/libreoffice.spec index ea6f6ee..6c63fe8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -52,7 +52,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.6.2.1 +Version: 7.6.3.1 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -78,15 +78,18 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t # GPGME bundle list Source1000: %{external_url}/gpgme-1.18.0.tar.bz2 Source1001: %{external_url}/libgpg-error-1.43.tar.bz2 -Source1002: %{external_url}/libassuan-2.5.6.tar.bz2 +Provides: bundled(gpgme) = 1.18.0 +Provides: bundled(libgpg-error) = 1.43 # Internal bundled stuff we can't remove # To build this we would pull cygwin; not worth it Source2001: https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll # hsqldb simply does not work with new system version, but luckily we migrate to firebird Source2002: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Provides: bundled(hsqldb) = 1.8.0 # Heavily patched and not possible to use system one Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +Provides: bundled(rhino) = 1.5R5 # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip # Needed for integration tests @@ -98,7 +101,8 @@ Source2008: %{external_url}/pdfium-5778.tar.bz2 Source2009: %{external_url}/dtoa-20180411.tgz # Skia is part of chromium and bundled everywhere as by google only way is monorepo way Source2010: %{external_url}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz -Source2012: %{external_url}/libcmis-0.5.2.tar.xz +Source2012: %{external_url}/libcmis-0.6.0.tar.xz +Provides: bundled(libcmis) = 0.6.0 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff @@ -140,6 +144,7 @@ BuildRequires: zlib-devel BuildRequires: curl-devel >= 7.68.0 %else Source2013: %{external_url}/curl-8.2.1.tar.xz +Provides: bundled(curl) = 8.2.1 %endif # Needed for tests BuildRequires: dejavu-fonts @@ -210,6 +215,8 @@ BuildRequires: pkgconfig(harfbuzz-icu) >= 2.6.8 %else Source2025: %{external_url}/harfbuzz-8.0.0.tar.xz Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz +Provides: bundled(graphite2) = 1.3.14 +Provides: bundled(harfbuzz) = 8.0.0 %endif BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) @@ -287,8 +294,11 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version} %if 0%{?suse_version} < 1550 # Too old boost on the system Source2020: %{external_url}/boost_1_82_0.tar.xz -Source2023: %{external_url}/poppler-23.06.0.tar.xz +Source2023: %{external_url}/poppler-23.09.0.tar.xz Source2024: %{external_url}/poppler-data-0.4.12.tar.gz +Provides: bundled(boost) = 1.82.0 +Provides: bundled(poppler) = 23.06.0 +Provides: bundled(poppler-data) = 0.4.12 %else BuildRequires: libboost_date_time-devel BuildRequires: libboost_filesystem-devel @@ -302,6 +312,7 @@ BuildRequires: pkgconfig(poppler-cpp) # Too old icu on the system Source2021: %{external_url}/icu4c-73_2-src.tgz Source2022: %{external_url}/icu4c-73_2-data.zip +Provides: bundled(icu) = 73.2 BuildRequires: java-devel >= 1.8 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel @@ -339,6 +350,13 @@ BuildRequires: python-rpm-macros %endif %if %{with system_gpgme} BuildRequires: libgpgmepp-devel >= 1.14 +%else +Source1000: %{external_url}/gpgme-1.18.0.tar.bz2 +Source1001: %{external_url}/libgpg-error-1.43.tar.bz2 +Source1002: %{external_url}/libassuan-2.5.6.tar.bz2 +Provides: bundled(gpgme) = 1.18.0 +Provides: bundled(libassuan) = 2.5.6 +Provides: bundled(libgpg-error) = 1.43 %endif %if %{with firebird} BuildRequires: pkgconfig(fbclient) diff --git a/poppler-23.06.0.tar.xz b/poppler-23.06.0.tar.xz deleted file mode 100644 index 247243e..0000000 --- a/poppler-23.06.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65 -size 1867384 diff --git a/poppler-23.09.0.tar.xz b/poppler-23.09.0.tar.xz new file mode 100644 index 0000000..effe959 --- /dev/null +++ b/poppler-23.09.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55 +size 1888836