From f0da9c3a27325e1c1441221e2605f6d152e57ed1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 10:59:43 +0000 Subject: import oscap-anaconda-addon-0.9-3.el7 --- diff --git a/SOURCES/centos-branding.patch b/SOURCES/centos-branding.patch deleted file mode 100644 index 5e07f7c..0000000 --- a/SOURCES/centos-branding.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNrp oscap-anaconda-addon-0.9.orig/org_fedora_oscap/common.py oscap-anaconda-addon-0.9/org_fedora_oscap/common.py ---- oscap-anaconda-addon-0.9.orig/org_fedora_oscap/common.py 2018-04-13 13:00:58.000000000 +0000 -+++ oscap-anaconda-addon-0.9/org_fedora_oscap/common.py 2018-11-21 14:34:05.807868425 +0000 -@@ -52,7 +52,7 @@ INSTALLATION_CONTENT_DIR = "/tmp/opensca - TARGET_CONTENT_DIR = "/root/openscap_data/" - - SSG_DIR = "/usr/share/xml/scap/ssg/content/" --SSG_CONTENT = "ssg-rhel7-ds.xml" -+SSG_CONTENT = "ssg-centos7-ds.xml" - if constants.shortProductName != 'anaconda': - if constants.shortProductName == 'fedora': - SSG_CONTENT = "ssg-fedora-ds.xml" diff --git a/SOURCES/translation_summary_screen_1543318.patch b/SOURCES/translation_summary_screen_1543318.patch new file mode 100644 index 0000000..7194f00 --- /dev/null +++ b/SOURCES/translation_summary_screen_1543318.patch @@ -0,0 +1,22 @@ +From c88dba4b9deeb78158bf2e239e4b7118a9e8b39f Mon Sep 17 00:00:00 2001 +From: Marek Haicman +Date: Thu, 7 Feb 2019 19:24:08 +0100 +Subject: [PATCH] Hack hub title to show translated. + +--- + org_fedora_oscap/gui/spokes/oscap.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/org_fedora_oscap/gui/spokes/oscap.py b/org_fedora_oscap/gui/spokes/oscap.py +index 72c1501..594969a 100644 +--- a/org_fedora_oscap/gui/spokes/oscap.py ++++ b/org_fedora_oscap/gui/spokes/oscap.py +@@ -190,6 +190,8 @@ def __init__(self, data, storage, payload, instclass): + + NormalSpoke.__init__(self, data, storage, payload, instclass) + self._addon_data = self.data.addons.org_fedora_oscap ++ # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1673071 ++ self.title = _(self.title) + self._storage = storage + self._ready = False + diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec index 73370e7..8d176f9 100644 --- a/SPECS/oscap-anaconda-addon.spec +++ b/SPECS/oscap-anaconda-addon.spec @@ -3,7 +3,7 @@ Name: oscap-anaconda-addon Version: 0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Anaconda addon integrating OpenSCAP to the installation process License: GPLv2+ @@ -19,7 +19,8 @@ Source0: %{name}-%{version}.tar.gz Patch0: datastream_tailoring_1364929.patch Patch1: update_japanese_translation_1569449.patch -Patch999: centos-branding.patch +Patch2: translation_summary_screen_1543318.patch + BuildArch: noarch BuildRequires: gettext BuildRequires: python2-devel @@ -41,7 +42,7 @@ content. %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -%patch999 -p1 +%patch2 -p1 %build @@ -59,8 +60,9 @@ make install DESTDIR=%{buildroot} %doc COPYING ChangeLog README.md %changelog -* Wed Nov 21 2018 Johnny Hughes - 0.9-2 -- Manual CentOS Debranding +* Thu Mar 14 2019 Jan Černý - 0.9-3 +- Enable translation of title 'SECURITY POLICY' at Installation Summary screen + Resolves: rhbz#1543318 * Mon Aug 20 2018 Watson Yuuma Sato - 0.9-2 - Add Japanese translation