The package rpms/libreoffice.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=9c429d...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=e181c6....
Change:
+ExcludeArch: %{ix86}
+%ifarch %{java_arches}
Thanks.
Full change:
============
commit 8f64feaf0a510880a37e97b37d1be19e4da432dd
Merge: 093db3b a69fa68
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Tue Aug 1 15:24:35 2023 -0500
Merge branch 'rawhide' into f38
commit a69fa68a33f3bd5386c048f078b0fe754b48a920
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Tue Aug 1 15:24:13 2023 -0500
7.5.5.2
diff --git a/.gitignore b/.gitignore
index 6d013e8..cc82f2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,9 @@
/libreoffice-help-7.5.4.2.tar.xz.asc
/libreoffice-translations-7.5.4.2.tar.xz
/libreoffice-translations-7.5.4.2.tar.xz.asc
+/libreoffice-7.5.5.2.tar.xz
+/libreoffice-7.5.5.2.tar.xz.asc
+/libreoffice-help-7.5.5.2.tar.xz
+/libreoffice-help-7.5.5.2.tar.xz.asc
+/libreoffice-translations-7.5.5.2.tar.xz
+/libreoffice-translations-7.5.5.2.tar.xz.asc
diff --git a/libreoffice.spec b/libreoffice.spec
index ba6beb2..59f6dfd 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 7.5.4
+%global libo_version 7.5.5
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@@ -58,7 +58,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 5%{?libo_prerelease}%{?dist}
+Release: 1%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -2258,6 +2258,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Mon Jul 31 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.5.2-1
+- 7.5.5.2
+
* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:7.5.4.2-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index 21c4cdd..656f314 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,9 @@
+SHA512 (libreoffice-7.5.5.2.tar.xz) =
22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
+SHA512 (libreoffice-7.5.5.2.tar.xz.asc) =
7338e2f0705199af066dc622ab43542c255c369e45cffae66c2c8afbf7881ac1751357f5ba3bd1cb6406e9e1dbb80bda6e86a43ecc1438bbaa6187127d49238b
+SHA512 (libreoffice-help-7.5.5.2.tar.xz) =
1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
+SHA512 (libreoffice-help-7.5.5.2.tar.xz.asc) =
1cab32c7cf9e30b80bdcf04299203966fd72aaaa8ca50656c9464fe34d6a537f70874fcb1a77deb29ce5ac7dd83209c17a7f6acb10870a2ed66328109fa01530
+SHA512 (libreoffice-translations-7.5.5.2.tar.xz) =
95dc83728e1350cde72a770ab29b9b001f7318620df9147b947cad598dfe075d934ee9dea1263c3fe5339b465f588e22c4af6335ce5fa8002a141981ec969213
+SHA512 (libreoffice-translations-7.5.5.2.tar.xz.asc) =
1cc768c1404bcb266c61610bf1422e6dc2eab32996a2a6ad0192b224f0046c68efe407f96cde24472b1aab39fea74d02a19250e6e1b2c2aa61a6f26f0ada7723
SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) =
a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) =
854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) =
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
@@ -5,9 +11,3 @@ SHA512
(f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens__
SHA512 (libreoffice-multiliblauncher.sh) =
db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (dragonbox-1.1.3.tar.gz) =
41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d
SHA512 (dtoa-20180411.tgz) =
722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
-SHA512 (libreoffice-7.5.4.2.tar.xz) =
582aa92a5cac3970a1fef96d6fbc4bd398c9f5705b5d9a05c83f374932a8050e7c3a20abe45d13db87eadc93334d9f3e6fb11075a86d7ad49c2f7768baedb6b3
-SHA512 (libreoffice-7.5.4.2.tar.xz.asc) =
040f749e4f3c77ae690c4c4806967d02e6de69b9106202f52b92111360297540fe0f0f6cb13ee0f33dc4860c1ba635310d16152980f956a546c7da09cc405a2b
-SHA512 (libreoffice-help-7.5.4.2.tar.xz) =
cea4222d05c2d5ce661758f080e26bf4bab3d158936b85482ec885241a5cb2abb38be108b1c5ed909b2d1ea762c550211330400377b89c483f4e9e3c8af16f3a
-SHA512 (libreoffice-help-7.5.4.2.tar.xz.asc) =
b3a58049c177ea7577e32a2a450e3c614915e25e0b938cb28defbfe435b341edced8e82e868ad5245039fbb7b957206d79f0e2a36da65ee7986f310f88800810
-SHA512 (libreoffice-translations-7.5.4.2.tar.xz) =
336259c9c42d5209ae0467891d2ff16c5cc556bf73a2972eb2fff26f1ebc829cc5b819e81a79f108114938eca61ebb44935ae1d0397683557c321a249df31b49
-SHA512 (libreoffice-translations-7.5.4.2.tar.xz.asc) =
2b44adf83ea768500c745e1068fbf35caf8f8a1edeb7c6ab531e28be151e041de6bd3a29c529ce42375f688b30fb7608ae27aa842de381823d189425d80d181f
commit ed91eda3a8bac024e4673cdffea3e7baf71de922
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Tue Aug 1 08:10:26 2023 +0200
Resolves: rhbz#2225976 Adapt test code to cURL 8.2.0
diff --git a/0001-Adapt-test-code-to-cURL-8.2.0.patch
b/0001-Adapt-test-code-to-cURL-8.2.0.patch
new file mode 100644
index 0000000..bfe94fc
--- /dev/null
+++ b/0001-Adapt-test-code-to-cURL-8.2.0.patch
@@ -0,0 +1,83 @@
+From 2a68dc02bd19a717d3c86873206fabed1098f228 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman(a)redhat.com>
+Date: Mon, 31 Jul 2023 17:09:32 +0200
+Subject: [PATCH] Adapt test code to cURL 8.2.0
+
+...for which CppunitTest_ucb_webdav_core would fail with
+
+> ucb/qa/cppunit/webdav/webdav_local_neon.cxx:60:(anonymous
namespace)::webdav_local_test::WebdavUriTest
+> equality assertion failed
+> - Expected: ?query#fragment
+> - Actual : /?query#fragment
+
+and
+
+> ucb/qa/cppunit/webdav/webdav_local_neon.cxx:89:(anonymous
namespace)::webdav_local_test::WebdavUriTest2
+> equality assertion failed
+> - Expected: ?query
+> - Actual : /?query
+
+because of
+<https://github.com/bch/curl/commit/5752e71080cb3aafa8b24c3261419345b832bc92>
+"urlapi: have *set(PATH) prepend a slash if one is missing".
+
+All that test code had been added with b03e070420606d407df2ec5e9dfa7043ecc46177
+"ucb: webdav-curl: fix CurlUri::CloneWithRelativeRefPathAbsolute()", and it
+looks harmless for our use cases that cURL started to behave differently there
+now. So instead of accepting either of the outcomes depending on what cURL
+version is being used, just change the test code to not leave out the
+path-absolute in the calls to CloneWithRelativeRefPathAbsolute (which is
+documented in ucb/source/ucp/webdav-curl/CurlUri.hxx to take
+
+> /// @param matches: relative-ref = path-absolute [ "?" query ] [
"#" fragment ]
+
+and path-absolute cannot be empty as per RFC 3986 "Uniform Resource Identifier
+(URI): Generic Syntax").
+
+Change-Id: If07a28598dfa047ebe89d8bcda19e8fcaa36aed0
+Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/155099
+Reviewed-by: Michael Stahl <michael.stahl(a)allotropia.de>
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
+---
+ ucb/qa/cppunit/webdav/webdav_local_neon.cxx | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
+index bde7652b9ffa..a457bc6d2b28 100644
+--- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
++++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
+@@ -52,12 +52,12 @@ namespace
+ CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"),
uri2.GetRelativeReference() );
+ CPPUNIT_ASSERT_EQUAL(
OUString("http://user%40anothername@server.biz:8040/foo/bar"), uri2.GetURI() );
+
+- CurlUri
uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query#fragment"));
++ CurlUri
uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query#fragment"));
+ CPPUNIT_ASSERT_EQUAL( OUString("http"), uri3.GetScheme() );
+ CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() );
+ CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri3.GetUser()
);
+ CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() );
+- CPPUNIT_ASSERT_EQUAL( OUString("?query#fragment"),
uri3.GetRelativeReference() );
++ CPPUNIT_ASSERT_EQUAL( OUString("/?query#fragment"),
uri3.GetRelativeReference() );
+ CPPUNIT_ASSERT_EQUAL(
OUString("http://user%40anothername@server.biz:8040/?query#fragment"),
uri3.GetURI() );
+ }
+
+@@ -80,13 +80,13 @@ namespace
+ CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"),
uri2.GetRelativeReference() );
+ CPPUNIT_ASSERT_EQUAL(
OUString("https://foo:bar@server.biz:8040/foo/bar"), uri2.GetURI() );
+
+- CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query"));
++ CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query"));
+ CPPUNIT_ASSERT_EQUAL( OUString("https"), uri3.GetScheme() );
+ CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() );
+ CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri3.GetUser() );
+ CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri3.GetPassword() );
+ CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() );
+- CPPUNIT_ASSERT_EQUAL( OUString("?query"), uri3.GetRelativeReference()
);
++ CPPUNIT_ASSERT_EQUAL( OUString("/?query"), uri3.GetRelativeReference()
);
+ CPPUNIT_ASSERT_EQUAL(
OUString("https://foo:bar@server.biz:8040/?query"), uri3.GetURI() );
+ }
+
+--
+2.41.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index cf04047..ba6beb2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -274,6 +274,7 @@ Patch6: 0001-include-filename-if-the-test-fails.patch
# backported
Patch7: 0001-fix-testSignDocument_PEM_PDF.patch
Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
+Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
commit 1cb061c48c73cff3da70319776daf8c24b9bc264
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Mon Jul 31 13:43:50 2023 +0200
Resolves: rhbz#2225976 Only pass -I... arguments to g-ir-scanner
diff --git a/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
b/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
new file mode 100644
index 0000000..917dd6a
--- /dev/null
+++ b/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
@@ -0,0 +1,36 @@
+From caddaaa6afd2709f72dfb6160a485d405ac03966 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz(a)ubuntu.com>
+Date: Tue, 11 Jul 2023 20:21:15 +0200
+Subject: [PATCH] Only pass -I... arguments to g-ir-scanner by using
+ pkg-config's --cflags-only-I
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise it is possible that e.g. -Wl,--export-dynamic is passed which is fatal.
+
+Change-Id: I1735641e3149c86456e1164b67509a719e09d446
+Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/154340
+Reviewed-by: René Engelhard <rene(a)debian.org>
+Tested-by: Caolán McNamara <caolan.mcnamara(a)collabora.com>
+Reviewed-by: Caolán McNamara <caolan.mcnamara(a)collabora.com>
+---
+ sysui/CustomTarget_share.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
+index b86521a3a80f..912048b2ad66 100644
+--- a/sysui/CustomTarget_share.mk
++++ b/sysui/CustomTarget_share.mk
+@@ -167,7 +167,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \
+ mkdir -p $(dir $@)
+ PYTHONWARNINGS=default g-ir-scanner
"${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
+ "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
+- `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` \
++ `${PKG_CONFIG} --cflags-only-I gobject-introspection-1.0 gtk+-3.0` \
+ -I"${SRCDIR}/include/" \
+ --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
+ --library=libreofficekitgtk
--library-path="${INSTDIR}/program" \
+--
+2.41.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index a8e096f..cf04047 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -273,6 +273,7 @@ Patch5: 0001-aarch64-failing-here.patch
Patch6: 0001-include-filename-if-the-test-fails.patch
# backported
Patch7: 0001-fix-testSignDocument_PEM_PDF.patch
+Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
commit 5e9b568c92b2e08c6a15b103fca52ae828c674c9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 20 11:54:52 2023 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/libreoffice.spec b/libreoffice.spec
index 559a392..a8e096f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -58,7 +58,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 4%{?libo_prerelease}%{?dist}
+Release: 5%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -2256,6 +2256,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:7.5.4.2-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
* Tue Jul 11 2023 František Zatloukal <fzatlouk(a)redhat.com> - 1:7.5.4.2-4
- Rebuilt for ICU 73.2
commit 404d15188215d8fd2c9467c7181e1f804cac59d8
Author: František Zatloukal <fzatlouk(a)redhat.com>
Date: Tue Jul 11 22:16:59 2023 +0200
Rebuilt for ICU 73.2
diff --git a/libreoffice.spec b/libreoffice.spec
index 8ffcc46..559a392 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -58,7 +58,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 3%{?libo_prerelease}%{?dist}
+Release: 4%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -2256,6 +2256,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Tue Jul 11 2023 František Zatloukal <fzatlouk(a)redhat.com> - 1:7.5.4.2-4
+- Rebuilt for ICU 73.2
+
* Fri Jun 30 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:7.5.4.2-3
- Make Java optional. Fixes rhbz#2084071.
commit 9c429dea2bf57ebc3a40acf417bd02854ea93fb9
Author: Mattia Verga <mattia(a)fedoraproject.org>
Date: Sat Jul 8 11:26:26 2023 +0000
Disable builds on ix86
diff --git a/libreoffice.spec b/libreoffice.spec
index b35fae2..8ffcc46 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -51,6 +51,9 @@
%global bundling_options %{nil}
+#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
+
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
commit e181c6d1a5e71e7277f51896ff2fda8e83de9361
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Sun Jul 2 09:08:14 2023 +0200
Make Java optional.
diff --git a/libreoffice.spec b/libreoffice.spec
index 199c846..b35fae2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 2%{?libo_prerelease}%{?dist}
+Release: 3%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -324,7 +324,7 @@ Requires: google-crosextra-caladea-fonts,
google-crosextra-carlito-fonts
Requires: %{name}-langpack-en = %{epoch}:%{version}-%{release}
%ifarch %{java_arches}
# rhbz#949106 libreoffice-core drags in both openjdk 1.7.0 and 1.8.0
-Requires: java-headless >= 1:1.6
+Recommends: java-headless >= 1:1.6
%else
Obsoletes: libreoffice-nlpsolver < 1:7.4.0.0
Obsoletes: libreoffice-officebean < 1:7.4.0.0
@@ -357,6 +357,9 @@ Summary: Database front-end for LibreOffice
%if 0%{?fedora}
Requires: firebird
%endif
+%ifarch %{java_arches}
+Requires: java-headless >= 1:1.6
+%endif
Requires: pentaho-reporting-flow-engine
Requires: postgresql-jdbc
Requires: %{name}-core%{?_isa} = %{epoch}:%{version}-%{release}
@@ -2250,6 +2253,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Fri Jun 30 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:7.5.4.2-3
+- Make Java optional. Fixes rhbz#2084071.
+
* Mon Jun 19 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:7.5.4.2-2
- Backport upstream fix for testSignDocument_PEM_PDF test failure
- Enable test again
commit d9eb7d48cf3802ecc560563d1b43b1360ec913d9
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Tue Jun 20 08:03:10 2023 +0900
Backport upstream fix for testSignDocument_PEM_PDF test failure
Enable test again
diff --git a/0001-fix-testSignDocument_PEM_PDF.patch
b/0001-fix-testSignDocument_PEM_PDF.patch
new file mode 100644
index 0000000..32c7395
--- /dev/null
+++ b/0001-fix-testSignDocument_PEM_PDF.patch
@@ -0,0 +1,61 @@
+From 599722cf77310429a9b9bd2a348486a08b60de0d Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos(a)collabora.com>
+Date: Mon, 13 Mar 2023 20:04:17 +0100
+Subject: svl: fix CppunitTest_desktop_lib's
+ DesktopLOKTest::testSignDocument_PEM_PDF
+
+The problem was that this test passed when the entire suite was running,
+but not as an individual test.
+
+Digging deeper, this didn't pass in isolation because the test loads a
+private key into memory (which is not in the NSS DB) and since commit
+5592ee094ca9f09bfcc16537d931518d4e6b2231 (svl: fix
+testSignDocument_PEM_PDF with "dbm:" NSS DB, 2022-04-28) we delete that
+in-memory key as a workaround for the NSS dbm -> sqlite transition.
+
+Fix the problem by not deleting the in-memory private key in the LOK
+case: this makes the test (operating in a stateless mode, with in-memory
+keys) pass again and keeps the desktop signing (working with the NSS DB)
+working.
+
+I noticed this test failure as a local test update of libxmlsec to 1.3
+RC started to fail here even when the whole suite was running, but looks
+like this was working by accident before anyway, and the fix doesn't
+hurt for libxmlsec 1.2, either.
+
+Change-Id: Id365ddc5c5d04d538609f444c0e3c4ab4b32a6fd
+Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/148817
+Tested-by: Jenkins
+Reviewed-by: Miklos Vajna <vmiklos(a)collabora.com>
+---
+ svl/source/crypto/cryptosign.cxx | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
+index 1d6337845569..e68ccb8aafda 100644
+--- a/svl/source/crypto/cryptosign.cxx
++++ b/svl/source/crypto/cryptosign.cxx
+@@ -26,6 +26,7 @@
+ #include <comphelper/processfactory.hxx>
+ #include <comphelper/random.hxx>
+ #include <comphelper/scopeguard.hxx>
++#include <comphelper/lok.hxx>
+ #include <com/sun/star/security/XCertificate.hpp>
+ #include <com/sun/star/uno/Sequence.hxx>
+ #include <o3tl/char16_t2wchar_t.hxx>
+@@ -640,7 +641,11 @@ NSSCMSMessage *CreateCMSMessage(const PRTime* time,
+ // if it works, and fallback if it doesn't.
+ if (SECKEYPrivateKey * pPrivateKey = PK11_FindKeyByAnyCert(cert, nullptr))
+ {
+- SECKEY_DestroyPrivateKey(pPrivateKey);
++ if (!comphelper::LibreOfficeKit::isActive())
++ {
++ // pPrivateKey only exists in the memory in the LOK case, don't delete
it.
++ SECKEY_DestroyPrivateKey(pPrivateKey);
++ }
+ *cms_signer = NSS_CMSSignerInfo_Create(result, cert, SEC_OID_SHA256);
+ }
+ else
+--
+cgit v1.2.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 89bee48..199c846 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 1%{?libo_prerelease}%{?dist}
+Release: 2%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -268,6 +268,8 @@ Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
# TODO investigate these
Patch5: 0001-aarch64-failing-here.patch
Patch6: 0001-include-filename-if-the-test-fails.patch
+# backported
+Patch7: 0001-fix-testSignDocument_PEM_PDF.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
@@ -1493,10 +1495,10 @@ install -m 0755 -d %{buildroot}%{baseinstdir}/share/extensions
rm -f %{buildroot}%{baseinstdir}/program/officebean.abignore
%endif
-#%%check
-#make unitcheck slowcheck
-## we don't need this anymore
-#rm -f %%{buildroot}%%{baseinstdir}/program/classes/smoketest.jar
+%check
+make unitcheck slowcheck
+# we don't need this anymore
+rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%files
@@ -2248,6 +2250,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Mon Jun 19 2023 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1:7.5.4.2-2
+- Backport upstream fix for testSignDocument_PEM_PDF test failure
+- Enable test again
+
* Fri Jun 16 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.4.2-1
- 7.5.4.2
- Drop 0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch, upstreamed.
commit 5dc3f05fdcaae7ca18bda1ee52478a92c60fa049
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Fri Jun 16 12:26:50 2023 -0500
7.5.4.2
diff --git a/.gitignore b/.gitignore
index f7fbb16..6d013e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,9 @@
/libreoffice-help-7.5.3.2.tar.xz.asc
/libreoffice-translations-7.5.3.2.tar.xz
/libreoffice-translations-7.5.3.2.tar.xz.asc
+/libreoffice-7.5.4.2.tar.xz
+/libreoffice-7.5.4.2.tar.xz.asc
+/libreoffice-help-7.5.4.2.tar.xz
+/libreoffice-help-7.5.4.2.tar.xz.asc
+/libreoffice-translations-7.5.4.2.tar.xz
+/libreoffice-translations-7.5.4.2.tar.xz.asc
diff --git a/0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch
b/0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch
deleted file mode 100644
index 906e235..0000000
--- a/0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 79250a55589007930278e3fa59ccdf24c6ff8ea6 Mon Sep 17 00:00:00 2001
-From: Khaled Hosny <khaled(a)aliftype.com>
-Date: Mon, 8 May 2023 16:14:52 +0300
-Subject: [PATCH] tdf#155161: Always embed fonts with CFF2 table as PDF Type 3
- fonts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-PDF doesn’t support CFF2 table and we currently don’t convert them to
-Type 1 (like we do with CFF table), so treat it like fonts with
-variations and embed as Type 3 fonts.
-
-Change-Id: I963b55d5d0ed1470eda157c7e10cae63195a0c91
-Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/151515
-Tested-by: Jenkins
-Reviewed-by: Adolfo Jayme Barrientos <fitojb(a)ubuntu.com>
----
- vcl/source/gdi/pdfwriter_impl.cxx | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
-index 6b9fb711626a..ce26ea6b1342 100644
---- a/vcl/source/gdi/pdfwriter_impl.cxx
-+++ b/vcl/source/gdi/pdfwriter_impl.cxx
-@@ -6283,6 +6283,13 @@ void PDFWriterImpl::registerGlyph(const sal_GlyphId nFontGlyphId,
- sal_uInt8& nMappedGlyph, sal_Int32&
nMappedFontObject)
- {
- auto bVariations = !pFace->GetVariations(*pFont).empty();
-+ // tdf#155161
-+ // PDF doesn’t support CFF2 table and we currently don’t convert them to
-+ // Type 1 (like we do with CFF table), so treat it like fonts with
-+ // variations and embed as Type 3 fonts.
-+ if (!pFace->GetRawFontData(HB_TAG('C', 'F', 'F',
'2')).empty())
-+ bVariations = true;
-+
- if (pFace->IsColorFont() || bVariations)
- {
- // Font has colors, check if this glyph has color layers or bitmap.
---
-2.40.1
-
diff --git a/libreoffice.spec b/libreoffice.spec
index aeb8b79..89bee48 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 7.5.3
+%global libo_version 7.5.4
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 4%{?libo_prerelease}%{?dist}
+Release: 1%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -268,7 +268,6 @@ Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
# TODO investigate these
Patch5: 0001-aarch64-failing-here.patch
Patch6: 0001-include-filename-if-the-test-fails.patch
-Patch7: 0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
@@ -2249,6 +2248,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Fri Jun 16 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.4.2-1
+- 7.5.4.2
+- Drop 0001-tdf-155161-Always-embed-fonts-with-CFF2-table-as-PDF.patch, upstreamed.
+
* Thu Jun 15 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.3.2-4
- Disable tests temporarily to resolve FTBFS.
diff --git a/sources b/sources
index 33d2092..21c4cdd 100644
--- a/sources
+++ b/sources
@@ -5,9 +5,9 @@ SHA512
(f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens__
SHA512 (libreoffice-multiliblauncher.sh) =
db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd
SHA512 (dragonbox-1.1.3.tar.gz) =
41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d
SHA512 (dtoa-20180411.tgz) =
722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
-SHA512 (libreoffice-7.5.3.2.tar.xz) =
ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
-SHA512 (libreoffice-7.5.3.2.tar.xz.asc) =
92ff4bba306d923871d83da0c68310fa02d6235f85e6cd480f3f944d6b555f43b3b6528298dcb387511cd8886f4f22cc6cbf2a4532ce0deeacd73c591771a634
-SHA512 (libreoffice-help-7.5.3.2.tar.xz) =
8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
-SHA512 (libreoffice-help-7.5.3.2.tar.xz.asc) =
3a9de105841be296e5b3e03ff826bb357b1f448e7031147ae51b9d5d974e9b3fc808cbba8dd5475abb33ef7159c722d5ab9a589de5f5da3f4c69ca09554bc692
-SHA512 (libreoffice-translations-7.5.3.2.tar.xz) =
7ad669b20e866ca16a952757664a20fab2461f6607cc5f08ff174b309d09941695580c19c123a87f3c616c98f18a964c06c4e0435b5f6c595e492233edc62b7f
-SHA512 (libreoffice-translations-7.5.3.2.tar.xz.asc) =
cf2a80d3a3ad6b0dde9be3cc97f350c0af10c092d94c87e7bdcb92c9d2ee7f7461be009112d3707d58e184392f14922692b074609fefd048ae549992f7b98e3e
+SHA512 (libreoffice-7.5.4.2.tar.xz) =
582aa92a5cac3970a1fef96d6fbc4bd398c9f5705b5d9a05c83f374932a8050e7c3a20abe45d13db87eadc93334d9f3e6fb11075a86d7ad49c2f7768baedb6b3
+SHA512 (libreoffice-7.5.4.2.tar.xz.asc) =
040f749e4f3c77ae690c4c4806967d02e6de69b9106202f52b92111360297540fe0f0f6cb13ee0f33dc4860c1ba635310d16152980f956a546c7da09cc405a2b
+SHA512 (libreoffice-help-7.5.4.2.tar.xz) =
cea4222d05c2d5ce661758f080e26bf4bab3d158936b85482ec885241a5cb2abb38be108b1c5ed909b2d1ea762c550211330400377b89c483f4e9e3c8af16f3a
+SHA512 (libreoffice-help-7.5.4.2.tar.xz.asc) =
b3a58049c177ea7577e32a2a450e3c614915e25e0b938cb28defbfe435b341edced8e82e868ad5245039fbb7b957206d79f0e2a36da65ee7986f310f88800810
+SHA512 (libreoffice-translations-7.5.4.2.tar.xz) =
336259c9c42d5209ae0467891d2ff16c5cc556bf73a2972eb2fff26f1ebc829cc5b819e81a79f108114938eca61ebb44935ae1d0397683557c321a249df31b49
+SHA512 (libreoffice-translations-7.5.4.2.tar.xz.asc) =
2b44adf83ea768500c745e1068fbf35caf8f8a1edeb7c6ab531e28be151e041de6bd3a29c529ce42375f688b30fb7608ae27aa842de381823d189425d80d181f
commit f9cd39050adfdc1d760acc38a150281db621f360
Author: Dan Horák <dan(a)danny.cz>
Date: Fri Jun 16 10:21:44 2023 +0200
be quiet when importing the content into the local git repo
diff --git a/libreoffice.spec b/libreoffice.spec
index 0f338e2..aeb8b79 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -992,7 +992,7 @@ rm -rf git-hooks */git-hooks
# This is normally done by %%autosetup -S git_am,
# but that does not work with multiple -b options, so we use plain %%setup above
%global __scm git_am
-%__scm_setup_git_am
+%__scm_setup_git_am -q
#Customize Palette to add Red Hat colours
(head -n -1 extras/source/palettes/standard.soc && \
commit 956eb8cf74d5fdfdaac46f0a1c38b7648affe1b8
Author: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Thu Jun 15 22:01:42 2023 -0500
Disable tests to remediate FTBFS
diff --git a/libreoffice.spec b/libreoffice.spec
index 3f7fd6c..0f338e2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 3%{?libo_prerelease}%{?dist}
+Release: 4%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -1494,10 +1494,10 @@ install -m 0755 -d %{buildroot}%{baseinstdir}/share/extensions
rm -f %{buildroot}%{baseinstdir}/program/officebean.abignore
%endif
-%check
-make unitcheck slowcheck
-# we don't need this anymore
-rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
+#%%check
+#make unitcheck slowcheck
+## we don't need this anymore
+#rm -f %%{buildroot}%%{baseinstdir}/program/classes/smoketest.jar
%files
@@ -2249,6 +2249,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Thu Jun 15 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.5.3.2-4
+- Disable tests temporarily to resolve FTBFS.
+
* Thu Jun 15 2023 Python Maint <python-maint(a)redhat.com> - 1:7.5.3.2-3
- Rebuilt for Python 3.12
commit 135a7bdda3d5afcd8dfa509fa03f8ed641fe3f60
Author: Python Maint <python-maint(a)redhat.com>
Date: Thu Jun 15 15:35:45 2023 +0200
Rebuilt for Python 3.12
diff --git a/libreoffice.spec b/libreoffice.spec
index 1b3ebf2..3f7fd6c 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 2%{?libo_prerelease}%{?dist}
+Release: 3%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -2249,6 +2249,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
&>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Thu Jun 15 2023 Python Maint <python-maint(a)redhat.com> - 1:7.5.3.2-3
+- Rebuilt for Python 3.12
+
* Tue May 09 2023 Caolán McNamara <caolanm(a)redhat.com> - 1:7.5.3.2-2
- rhbz#2192915 Japanese font not printed
commit d07abe21ccca59a9d581e4ddef641979d0fae6d3
Author: Stephan Bergmann <sbergman(a)redhat.com>
Date: Wed May 10 13:46:02 2023 +0200
Drop unused BuildRequires: pkgconfig(dbus-glib-1)
...which had originally been added with 38ee1f0e29947913192d3566e1d47cfd3e51b18e
"add missing build dep", but without any further information. (And then
changed
from an explicit dbus-glib-devel to the current pkconfig(dbus-glib-1) in
fb9ee009aecca813d1286988a190b49050bb449a "update build deps to Packaging
Guidelines".) But it appears to be completely unused by now.
diff --git a/libreoffice.spec b/libreoffice.spec
index 3b19e7f..1b3ebf2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -147,7 +147,6 @@ BuildRequires: lpsolve-devel
BuildRequires: openldap-devel
BuildRequires: pam-devel
BuildRequires: pkgconfig(bluez)
-BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dconf)
BuildRequires: pkgconfig(epoxy)
BuildRequires: pkgconfig(evolution-data-server-1.2)