From 5786973acde60d28ae228505c1211257add0869e Mon Sep 17 00:00:00 2001 From: Matej Tyc Date: Mon, 24 Jan 2022 15:41:52 +0100 Subject: [PATCH] Prepare for the rhel9 release - Introduce unified help support - Update translations Resolves: rhbz#2043512 Resolves: rhbz#2017374 --- lang.patch | 42 +++++++++------ ...onda-addon-2.1.0-unified_help-PR_192.patch | 52 +++++++++++++++++++ oscap-anaconda-addon.spec | 9 +++- 3 files changed, 86 insertions(+), 17 deletions(-) create mode 100644 oscap-anaconda-addon-2.1.0-unified_help-PR_192.patch diff --git a/lang.patch b/lang.patch index e0c9a26..53aea35 100644 --- a/lang.patch +++ b/lang.patch @@ -1,6 +1,6 @@ diff -U3 -N -r a/po/cs.po b/po/cs.po --- a/po/cs.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/cs.po 2021-11-10 10:56:44.207697106 +0100 ++++ b/po/cs.po 2022-01-24 15:40:42.974286864 +0100 @@ -13,7 +13,7 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -84,15 +84,16 @@ diff -U3 -N -r a/po/cs.po b/po/cs.po #: ../org_fedora_oscap/gui/spokes/oscap.py:201 diff -U3 -N -r a/po/de.po b/po/de.po --- a/po/de.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/de.po 2021-11-10 10:56:44.207697106 +0100 ++++ b/po/de.po 2022-01-24 15:40:42.974286864 +0100 @@ -4,15 +4,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-21 11:51+0200\n" -"PO-Revision-Date: 2019-08-30 10:55-0400\n" -+"PO-Revision-Date: 2021-07-13 13:04+0000\n" - "Last-Translator: Ludek Janda \n" +-"Last-Translator: Ludek Janda \n" -"Language-Team: German\n" ++"PO-Revision-Date: 2021-12-28 22:16+0000\n" ++"Last-Translator: Ettore Atalan \n" +"Language-Team: German \n" "Language: de\n" @@ -102,10 +103,19 @@ diff -U3 -N -r a/po/de.po b/po/de.po -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: Zanata 4.6.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" -+"X-Generator: Weblate 4.7.1\n" ++"X-Generator: Weblate 4.10.1\n" #: ../org_fedora_oscap/common.py:326 #, python-brace-format +@@ -30,7 +31,7 @@ + + #: ../org_fedora_oscap/data_fetch.py:117 + msgid "Network connection needed to fetch data." +-msgstr "" ++msgstr "Zum Abrufen der Daten ist eine Netzwerkverbindung erforderlich." + + #: ../org_fedora_oscap/data_fetch.py:262 + #, python-brace-format @@ -192,7 +193,7 @@ #. title of the spoke (will be displayed on the hub) #: ../org_fedora_oscap/gui/spokes/oscap.py:201 @@ -126,7 +136,7 @@ diff -U3 -N -r a/po/de.po b/po/de.po msgid "_Change content" diff -U3 -N -r a/po/fi.po b/po/fi.po --- a/po/fi.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/fi.po 2021-11-10 10:56:44.207697106 +0100 ++++ b/po/fi.po 2022-01-24 15:40:42.975286864 +0100 @@ -7,38 +7,41 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -222,7 +232,7 @@ diff -U3 -N -r a/po/fi.po b/po/fi.po #: ../org_fedora_oscap/gui/spokes/oscap.py:201 diff -U3 -N -r a/po/fr.po b/po/fr.po --- a/po/fr.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/fr.po 2021-11-10 10:56:44.207697106 +0100 ++++ b/po/fr.po 2022-01-24 15:40:42.975286864 +0100 @@ -13,40 +13,41 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -324,7 +334,7 @@ diff -U3 -N -r a/po/fr.po b/po/fr.po #: ../org_fedora_oscap/gui/spokes/oscap.py:201 diff -U3 -N -r a/po/hr.po b/po/hr.po --- a/po/hr.po 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/hr.po 2021-11-10 10:56:44.207697106 +0100 ++++ b/po/hr.po 2022-01-24 15:40:42.975286864 +0100 @@ -0,0 +1,340 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER @@ -668,7 +678,7 @@ diff -U3 -N -r a/po/hr.po b/po/hr.po +msgstr "_Preuzmi" diff -U3 -N -r a/po/ja.po b/po/ja.po --- a/po/ja.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/ja.po 2021-11-10 10:56:44.208697114 +0100 ++++ b/po/ja.po 2022-01-24 15:40:42.975286864 +0100 @@ -8,38 +8,37 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -797,7 +807,7 @@ diff -U3 -N -r a/po/ja.po b/po/ja.po msgid "Error fetching and loading content" diff -U3 -N -r a/po/ko.po b/po/ko.po --- a/po/ko.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/ko.po 2021-11-10 10:56:44.208697114 +0100 ++++ b/po/ko.po 2022-01-24 15:40:42.975286864 +0100 @@ -6,38 +6,37 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -889,7 +899,7 @@ diff -U3 -N -r a/po/ko.po b/po/ko.po #: ../org_fedora_oscap/gui/spokes/oscap.py:201 diff -U3 -N -r a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot --- a/po/oscap-anaconda-addon.pot 2021-07-02 15:52:56.000000000 +0200 -+++ b/po/oscap-anaconda-addon.pot 2021-11-10 10:56:44.225697261 +0100 ++++ b/po/oscap-anaconda-addon.pot 2022-01-24 15:40:42.978286863 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -1073,7 +1083,7 @@ diff -U3 -N -r a/po/oscap-anaconda-addon.pot b/po/oscap-anaconda-addon.pot diff -U3 -N -r a/po/pl.po b/po/pl.po --- a/po/pl.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/pl.po 2021-11-10 10:56:44.208697114 +0100 ++++ b/po/pl.po 2022-01-24 15:40:42.975286864 +0100 @@ -26,40 +26,42 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -1170,7 +1180,7 @@ diff -U3 -N -r a/po/pl.po b/po/pl.po #: ../org_fedora_oscap/gui/spokes/oscap.py:201 diff -U3 -N -r a/po/si.po b/po/si.po --- a/po/si.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/si.po 2021-11-10 10:56:44.208697114 +0100 ++++ b/po/si.po 2022-01-24 15:40:42.975286864 +0100 @@ -7,13 +7,16 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -1202,7 +1212,7 @@ diff -U3 -N -r a/po/si.po b/po/si.po msgid "Fetching content data" diff -U3 -N -r a/po/sv.po b/po/sv.po --- a/po/sv.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/sv.po 2021-11-10 10:56:44.208697114 +0100 ++++ b/po/sv.po 2022-01-24 15:40:42.975286864 +0100 @@ -4,40 +4,40 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -1317,7 +1327,7 @@ diff -U3 -N -r a/po/sv.po b/po/sv.po msgid "Fetching content data" diff -U3 -N -r a/po/uk.po b/po/uk.po --- a/po/uk.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/uk.po 2021-11-10 10:56:44.208697114 +0100 ++++ b/po/uk.po 2022-01-24 15:40:42.975286864 +0100 @@ -5,39 +5,42 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" @@ -1414,7 +1424,7 @@ diff -U3 -N -r a/po/uk.po b/po/uk.po #: ../org_fedora_oscap/gui/spokes/oscap.py:201 diff -U3 -N -r a/po/zh_CN.po b/po/zh_CN.po --- a/po/zh_CN.po 2021-07-02 17:17:04.000000000 +0200 -+++ b/po/zh_CN.po 2021-11-10 10:56:44.208697114 +0100 ++++ b/po/zh_CN.po 2022-01-24 15:40:42.975286864 +0100 @@ -5,37 +5,37 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" diff --git a/oscap-anaconda-addon-2.1.0-unified_help-PR_192.patch b/oscap-anaconda-addon-2.1.0-unified_help-PR_192.patch new file mode 100644 index 0000000..8f7c7b2 --- /dev/null +++ b/oscap-anaconda-addon-2.1.0-unified_help-PR_192.patch @@ -0,0 +1,52 @@ +From 3d7a943969d542392134f55078eadb0793b094dc Mon Sep 17 00:00:00 2001 +From: Vendula Poncova +Date: Wed, 22 Sep 2021 17:52:03 +0200 +Subject: [PATCH 1/2] Specify a unique screen id + +All spokes and hubs should provide a unique id. +--- + org_fedora_oscap/gui/spokes/oscap.py | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py +index fe26076..44c7ced 100644 +--- a/org_fedora_oscap/gui/spokes/oscap.py ++++ b/org_fedora_oscap/gui/spokes/oscap.py +@@ -204,6 +204,11 @@ class OSCAPSpoke(NormalSpoke): + # as it is displayed inside the spoke as the spoke label, + # and spoke labels are all uppercase by a convention. + ++ @staticmethod ++ def get_screen_id(): ++ """Return a unique id of this UI screen.""" ++ return "security-policy-selection" ++ + @classmethod + def should_run(cls, environment, data): + return is_module_available(OSCAP) + +From ae9fdc9e6e189db215aeb39f2881311e5281587b Mon Sep 17 00:00:00 2001 +From: Vendula Poncova +Date: Wed, 22 Sep 2021 17:52:51 +0200 +Subject: [PATCH 2/2] Remove the help_id attribute + +The help_id attribute is no longer used. Specify a screen id +or redefine the help handler to provide the built-in help. +--- + org_fedora_oscap/gui/spokes/oscap.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py +index 44c7ced..6d0aa5c 100644 +--- a/org_fedora_oscap/gui/spokes/oscap.py ++++ b/org_fedora_oscap/gui/spokes/oscap.py +@@ -185,9 +185,6 @@ class OSCAPSpoke(NormalSpoke): + # name of the .glade file in the same directory as this source + uiFile = "oscap.glade" + +- # id of the help content for this spoke +- help_id = "SecurityPolicySpoke" +- + # domain of oscap-anaconda-addon translations + translationDomain = "oscap-anaconda-addon" + diff --git a/oscap-anaconda-addon.spec b/oscap-anaconda-addon.spec index 7f092c1..e17683b 100644 --- a/oscap-anaconda-addon.spec +++ b/oscap-anaconda-addon.spec @@ -10,7 +10,7 @@ Name: oscap-anaconda-addon Version: 2.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Anaconda addon integrating OpenSCAP to the installation process License: GPLv2+ @@ -27,6 +27,7 @@ Patch4: oscap-anaconda-addon-2.0.1-fix_no_hardening-PR_176.patch Patch5: oscap-anaconda-addon-2.0.1-fix_fingerprint-PR_177.patch Patch6: oscap-anaconda-addon-2.0.1-rhel9_tailoring_fix-PR_180.patch Patch7: oscap-anaconda-addon-1.2.2-dbus_show_integration-PR_182.patch +Patch8: oscap-anaconda-addon-2.1.0-unified_help-PR_192.patch BuildArch: noarch BuildRequires: make @@ -66,6 +67,12 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README.md %changelog +* Mon Jan 24 2022 Matej Tyc - 2.0.0-8 +- Introduce unified help support + Resolves: rhbz#2043512 +- Update translations + Resolves: rhbz#2017374 + * Mon Dec 13 2021 Matej Tyc - 2.0.0-7 - Don't show the OSCAP spoke if the OSCAP DBus module is disabled Resolves: rhbz#2018954