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=08a942...
https://src.fedoraproject.org/cgit/rpms/libreoffice.git/commit/?id=7bb7ab....
Change:
-ExcludeArch: s390x
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 8d97abbb709712b85e4e103131f480ebf3cd6526
Merge: 3fbe085 08a942c
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Sat Jul 3 14:18:19 2021 +0100
Merge branch 'rawhide' into f34
commit 08a942cd847b35443cd4c6dd6f95c3a55a007ad2
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Sat Jul 3 14:17:04 2021 +0100
reenable s390x
diff --git a/libreoffice.spec b/libreoffice.spec
index 716d791..09c54e3 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -54,9 +54,6 @@ Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
-# rhbz#1969393 firebird is unavailable at the moment
-ExcludeArch: s390x
-
Source0:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2:
%{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
commit b2fb85a84cf9e4cab999abad74cb2b84c1bed068
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Fri Jul 2 11:15:37 2021 +0100
add missing xmlns:loext to example_sl-SI.xml
diff --git a/0001-add-missing-xmlns-loext-to-example_sl-SI.xml.patch
b/0001-add-missing-xmlns-loext-to-example_sl-SI.xml.patch
new file mode 100644
index 0000000..cad796d
--- /dev/null
+++ b/0001-add-missing-xmlns-loext-to-example_sl-SI.xml.patch
@@ -0,0 +1,36 @@
+From 3766e78348d52b9491179c32e9062e25e58250f7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
+Date: Thu, 27 May 2021 11:13:29 +0100
+Subject: [PATCH] add missing xmlns:loext to example_sl-SI.xml
+
+added to example.xml by
+
+commit 71ee09947d5a71105d64fd225bb3672dfa7ce834
+Date: Tue Sep 19 15:37:04 2017 +0200
+
+ TSCP: add advanced classification dialog
+
+but not to example_sl-SI.xml
+
+Change-Id: I8aa46554867db8c51bd118b6cc87e649b922cdfb
+Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/116157
+Tested-by: Jenkins
+Reviewed-by: Adolfo Jayme Barrientos <fitojb(a)ubuntu.com>
+---
+ sfx2/classification/example_sl-SI.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sfx2/classification/example_sl-SI.xml
b/sfx2/classification/example_sl-SI.xml
+index 99e04a7aab71..13a4bcfdf29a 100644
+--- a/sfx2/classification/example_sl-SI.xml
++++ b/sfx2/classification/example_sl-SI.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0"?>
+-<baf:BusinessAuthorization xmlns:baf="urn:tscp:names:baf:1.1">
++<baf:BusinessAuthorization xmlns:baf="urn:tscp:names:baf:1.1"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
+ <baf:PolicyAuthorityName>Avtoriteta primera politike
TSCP</baf:PolicyAuthorityName>
+ <baf:PolicyName>Primer politike TSCP</baf:PolicyName>
+ <baf:AdministrativeData>
+--
+2.31.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 3b74f40..716d791 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -265,6 +265,7 @@ Patch12:
0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch
Patch13: 0001-allow-system-firebird-4.patch
Patch14: 0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch
Patch15: 0001-math.desktop-include-Spreadsheet-category.patch
+Patch16: 0001-add-missing-xmlns-loext-to-example_sl-SI.xml.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
commit a83a3b2c8ee59c9a1184b5d4a6d6c1a0dc4fe915
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Fri Jul 2 11:12:42 2021 +0100
remove "Spreadsheet" category from math.desktop
diff --git a/0001-math.desktop-include-Spreadsheet-category.patch
b/0001-math.desktop-include-Spreadsheet-category.patch
new file mode 100644
index 0000000..2969ea8
--- /dev/null
+++ b/0001-math.desktop-include-Spreadsheet-category.patch
@@ -0,0 +1,39 @@
+From f586051919d047e2b67d32637817c3d96a898494 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com>
+Date: Wed, 9 Jun 2021 09:13:23 +0100
+Subject: [PATCH] math.desktop include "Spreadsheet" category
+
+but it's not a spreadsheet
+
+since...
+
+commit dad7fe7227fb80a32d3c2c777584dc9d74b9e929
+Date: Thu Jan 2 16:16:55 2014 +0100
+
+ Fix math categories to make SUSE rpm check happy
+
+Change-Id: I0397ea12cd7f29f4b0c1f0e0ad76a3429b55c455
+Reviewed-on:
https://gerrit.libreoffice.org/c/core/+/116884
+Tested-by: Jenkins
+Reviewed-by: Adolfo Jayme Barrientos <fitojb(a)ubuntu.com>
+(cherry picked from commit 2df2ce1b51d13bc9e203fab1b7eb3c88c906588c)
+---
+ sysui/desktop/menus/math.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
+index d2391be5c234..5a8192ae4abc 100644
+--- a/sysui/desktop/menus/math.desktop
++++ b/sysui/desktop/menus/math.desktop
+@@ -21,7 +21,7 @@ Terminal=false
+ NoDisplay=false
+ Icon=math
+ Type=Application
+-Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
++Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
+ Exec=${UNIXBASISROOTNAME} --math %%FILE%%
+
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
+ Name=%PRODUCTNAME Math
+--
+2.31.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 3d1c6d5..3b74f40 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -264,6 +264,7 @@ Patch11:
0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch
Patch12: 0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch
Patch13: 0001-allow-system-firebird-4.patch
Patch14: 0001-Remove-unused-DOCTYPE-from-odk-examples-xcu-file.patch
+Patch15: 0001-math.desktop-include-Spreadsheet-category.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
commit 17b873e4f37276c4c32e2b5103f65a3de68aba70
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Fri Jul 2 10:43:12 2021 +0100
silence rpminspect: an invalid-looking DT_RPATH: $ORIGIN/../../program
which is intentional and desirable for libreoffice
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..c86a37a
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,6 @@
+runpath:
+ allowed_origin_paths:
+ # this is the real part after $ORIGIN
+ - /../../program
+ # but match this because that is what rpminspect turns it into
+ - /program
commit 7bb7abeeb5d81f662f4c109a60e5cf1d36c9ac14
Author: Caolán McNamara <caolanm(a)redhat.com>
Date: Wed Jun 30 16:09:15 2021 +0100
rhbz#1969393 firebird is unavailable at the moment in F35
diff --git a/libreoffice.spec b/libreoffice.spec
index b677948..3d1c6d5 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -54,6 +54,9 @@ Release: 2%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2
or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL:
http://www.libreoffice.org/
+# rhbz#1969393 firebird is unavailable at the moment
+ExcludeArch: s390x
+
Source0:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz
Source1:
%{source_url}/libreoffice-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz.asc
Source2:
%{source_url}/libreoffice-help-%{version}%{?libo_prerelease}%{?libo_buildfix}.tar.xz