From 409ea3e7131c79c1edb3741ff0e81e7be9a9caec Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jul 16 2021 21:38:55 +0000 Subject: Merge in refreshed patch stack from c8s --- diff --git a/SOURCES/0001-Fix-CDN-button-visibility.patch b/SOURCES/0001-Fix-CDN-button-visibility.patch new file mode 100644 index 0000000..2f30fff --- /dev/null +++ b/SOURCES/0001-Fix-CDN-button-visibility.patch @@ -0,0 +1,56 @@ +From 105134042d26ce62ecd39657f016e0b333d4aa68 Mon Sep 17 00:00:00 2001 +From: Martin Kolman +Date: Fri, 11 Sep 2020 15:27:59 +0200 +Subject: [PATCH 1/2] Fix CDN button visibility + +Only show the Red Hat CDN button if the Subscription +module appears to be running. To achieve that, we do +the same thing as with the HMC button - the CDN +button invisible by default. And enable it only if it +looks like the Subscription module is running. + +(cherry picked from commit: aca297587ab8bdd7342fa056273bfff379bc0a0b) + +Resolves: rhbz#1903178 + +https://github.com/rhinstaller/anaconda/pull/3020 +https://github.com/M4rtinK/anaconda/commit/c29802a2be591a4cdcc91ba86b74fc4d01087b72 +--- + pyanaconda/ui/gui/spokes/installation_source.glade | 2 +- + pyanaconda/ui/gui/spokes/installation_source.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyanaconda/ui/gui/spokes/installation_source.glade b/pyanaconda/ui/gui/spokes/installation_source.glade +index a23f8be714..e53fa230ca 100644 +--- a/pyanaconda/ui/gui/spokes/installation_source.glade ++++ b/pyanaconda/ui/gui/spokes/installation_source.glade +@@ -633,9 +633,9 @@ + + + Red Hat _CDN +- True + True + False ++ True + 12 + True + 0 +diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py +index 6aab9b387a..d0d4da72b9 100644 +--- a/pyanaconda/ui/gui/spokes/installation_source.py ++++ b/pyanaconda/ui/gui/spokes/installation_source.py +@@ -854,9 +854,9 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler): + def _initialize(self): + threadMgr.wait(constants.THREAD_PAYLOAD) + +- # If there is no Subscriptiopn DBus module, disable the CDN radio button ++ # If there is the Subscriptiopn DBus module, make the CDN radio button visible + if is_module_available(SUBSCRIPTION): +- gtk_call_once(self._cdn_button.set_no_show_all, True) ++ gtk_call_once(self._cdn_button.set_no_show_all, False) + + # Get the current source. + source_proxy = self.payload.get_source_proxy() +-- +2.31.1 + diff --git a/SOURCES/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch b/SOURCES/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch new file mode 100644 index 0000000..8e7adf3 --- /dev/null +++ b/SOURCES/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch @@ -0,0 +1,26 @@ +From 96351859cfd2030c4ab2f931f2f0a38190180e00 Mon Sep 17 00:00:00 2001 +From: Vendula Poncova +Date: Wed, 10 Feb 2021 17:50:11 +0100 +Subject: [PATCH 2/2] Use a custom stylesheet to define RHEL-specific + stylesheet data + +Use a stylesheet provided by the rhel-logos package. +--- + data/product.d/rhel.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/product.d/rhel.conf b/data/product.d/rhel.conf +index c4de9b6a8a..5f69be1d45 100644 +--- a/data/product.d/rhel.conf ++++ b/data/product.d/rhel.conf +@@ -50,6 +50,7 @@ default_help_pages = + rhel_help_placeholder.xml + rhel_help_placeholder.xml + ++custom_stylesheet = /usr/share/anaconda/pixmaps/redhat.css + blivet_gui_supported = False + + [License] +-- +2.31.1 + diff --git a/SOURCES/0003-Fix-CDN-button-visibility.patch b/SOURCES/0003-Fix-CDN-button-visibility.patch deleted file mode 100644 index fed1596..0000000 --- a/SOURCES/0003-Fix-CDN-button-visibility.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f4f5fd58919424a1ff7b397b80c935bd013b2bc2 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Fri, 11 Sep 2020 15:27:59 +0200 -Subject: [PATCH 3/3] Fix CDN button visibility - -Only show the Red Hat CDN button if the Subscription -module appears to be running. To achieve that, we do -the same thing as with the HMC button - the CDN -button invisible by default. And enable it only if it -looks like the Subscription module is running. - -(cherry picked from commit: aca297587ab8bdd7342fa056273bfff379bc0a0b) - -Resolves: rhbz#1903178 - -https://github.com/rhinstaller/anaconda/pull/3020 -https://github.com/M4rtinK/anaconda/commit/c29802a2be591a4cdcc91ba86b74fc4d01087b72 ---- - pyanaconda/ui/gui/spokes/installation_source.glade | 2 +- - pyanaconda/ui/gui/spokes/installation_source.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pyanaconda/ui/gui/spokes/installation_source.glade b/pyanaconda/ui/gui/spokes/installation_source.glade -index a23f8be714..e53fa230ca 100644 ---- a/pyanaconda/ui/gui/spokes/installation_source.glade -+++ b/pyanaconda/ui/gui/spokes/installation_source.glade -@@ -633,9 +633,9 @@ - - - Red Hat _CDN -- True - True - False -+ True - 12 - True - 0 -diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py -index 6aab9b387a..d0d4da72b9 100644 ---- a/pyanaconda/ui/gui/spokes/installation_source.py -+++ b/pyanaconda/ui/gui/spokes/installation_source.py -@@ -854,9 +854,9 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler): - def _initialize(self): - threadMgr.wait(constants.THREAD_PAYLOAD) - -- # If there is no Subscriptiopn DBus module, disable the CDN radio button -+ # If there is the Subscriptiopn DBus module, make the CDN radio button visible - if is_module_available(SUBSCRIPTION): -- gtk_call_once(self._cdn_button.set_no_show_all, True) -+ gtk_call_once(self._cdn_button.set_no_show_all, False) - - # Get the current source. - source_proxy = self.payload.get_source_proxy() --- -2.31.1 - diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index ec3d00f..9c84d96 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 33.16.5.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -13,7 +13,10 @@ URL: http://fedoraproject.org/wiki/Anaconda Source0: %{name}-%{version}.tar.bz2 # https://github.com/rhinstaller/anaconda/pull/3020 -Patch10003: 0003-Fix-CDN-button-visibility.patch +Patch10001: 0001-Fix-CDN-button-visibility.patch + +# https://github.com/rhinstaller/anaconda/pull/3477 +Patch10002: 0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch ## Hyperscale changes ### Cf. https://pagure.io/centos-sig-hyperscale/anaconda/commits/c8s-hs-v33.16.5.2 @@ -393,6 +396,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Fri Jul 16 2021 Neal Gompa - 33.16.5.2-5 +- Merge in refreshed patch stack from c8s + * Sun Jun 27 2021 Neal Gompa - 33.16.5.2-4 - Fix liveinst to be able to detect Hyperscale variant