Resolves: rhbz#1979145 merge in rpminspect warning fixes
This commit is contained in:
Caolán McNamara
parent
3a69b82d36
commit
c3053967cd
36
0001-add-missing-xmlns-loext-to-example_sl-SI.xml.patch
Normal file
36
0001-add-missing-xmlns-loext-to-example_sl-SI.xml.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From 3766e78348d52b9491179c32e9062e25e58250f7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@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@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
|
||||
|
||||
39
0001-math.desktop-include-Spreadsheet-category.patch
Normal file
39
0001-math.desktop-include-Spreadsheet-category.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From f586051919d047e2b67d32637817c3d96a898494 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@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@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
|
||||
|
||||
@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: %{libo_version}.2
|
||||
Release: 3%{?libo_prerelease}%{?dist}
|
||||
Release: 4%{?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/
|
||||
|
||||
@ -261,6 +261,8 @@ 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
|
||||
Patch16: 0001-add-missing-xmlns-loext-to-example_sl-SI.xml.patch
|
||||
|
||||
# not upstreamed
|
||||
Patch500: 0001-disable-libe-book-support.patch
|
||||
@ -2246,6 +2248,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_includedir}/LibreOfficeKit
|
||||
|
||||
%changelog
|
||||
* Wed Jun 30 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.4.2-4
|
||||
- Resolves: rhbz#1979145 merge in rpminspect warning fixes
|
||||
|
||||
* Wed Jun 30 2021 Caolán McNamara <caolanm@redhat.com> - 1:7.1.4.2-3
|
||||
- rhbz#1977653 drop unneeded bsh build-dependency
|
||||
- Remove unused DOCTYPE from odk/examples xcu file
|
||||
|
||||
6
rpminspect.yaml
Normal file
6
rpminspect.yaml
Normal file
@ -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
|
||||
Loading…
Reference in New Issue
Block a user