diff --git a/SOURCES/0001-Add-CentOS-Stream-config.patch b/SOURCES/0001-Add-CentOS-Stream-config.patch index 6a11e90..34a6bba 100644 --- a/SOURCES/0001-Add-CentOS-Stream-config.patch +++ b/SOURCES/0001-Add-CentOS-Stream-config.patch @@ -1,7 +1,7 @@ From cf1a449f229217f169d61f65b9719b9923aa02df Mon Sep 17 00:00:00 2001 From: Pat Riehecky Date: Mon, 23 Nov 2020 13:50:06 -0600 -Subject: [PATCH 1/3] Add CentOS Stream config +Subject: [PATCH 1/4] Add CentOS Stream config https://github.com/rhinstaller/anaconda/pull/3014 https://github.com/rhinstaller/anaconda/commit/150bbc179cf51226d6c1bd46279e076ff683ec03 diff --git a/SOURCES/0002-Enable-closest-mirror-in-CentOS-Stream-config.patch b/SOURCES/0002-Enable-closest-mirror-in-CentOS-Stream-config.patch new file mode 100644 index 0000000..8cc279e --- /dev/null +++ b/SOURCES/0002-Enable-closest-mirror-in-CentOS-Stream-config.patch @@ -0,0 +1,23 @@ +From aebf7ae130e4717b612b0dd98b2809e106567656 Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Tue, 27 Apr 2021 16:01:21 -0500 +Subject: [PATCH 2/4] Enable closest mirror in CentOS Stream config + +Resolves: rhbz#1953698 +--- + data/product.d/centos-stream.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf +index 79d13392af..723a484038 100644 +--- a/data/product.d/centos-stream.conf ++++ b/data/product.d/centos-stream.conf +@@ -30,4 +30,5 @@ default_help_pages = + centos_help_placeholder.xml + + [Payload] ++enable_closest_mirror = True + default_source = CLOSEST_MIRROR +-- +2.30.2 + diff --git a/SOURCES/0002-Fix-CDN-button-visibility.patch b/SOURCES/0002-Fix-CDN-button-visibility.patch deleted file mode 100644 index 9683155..0000000 --- a/SOURCES/0002-Fix-CDN-button-visibility.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c7a02a91a28e848ffc2a656009fc699c15541ca6 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Fri, 11 Sep 2020 15:27:59 +0200 -Subject: [PATCH 2/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.30.2 - diff --git a/SOURCES/0003-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch b/SOURCES/0003-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch deleted file mode 100644 index 96c80a9..0000000 --- a/SOURCES/0003-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 17f03eed5904dbc91423e5893279906efcbff091 Mon Sep 17 00:00:00 2001 -From: Jiri Konecny -Date: Mon, 26 Apr 2021 18:41:43 +0200 -Subject: [PATCH 3/3] Add base repo name for CentOS Stream after repository - renaming - -CentOS Stream renamed the repository to make everything consistent. For that we -have to keep old repository name for RHEL but also we need the new one for -CentOS Stream. - -Resolves: rhbz#1946347 ---- - pyanaconda/core/constants.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py -index a0099451bd..9c56068e9e 100644 ---- a/pyanaconda/core/constants.py -+++ b/pyanaconda/core/constants.py -@@ -60,7 +60,8 @@ BASE_REPO_NAME = "anaconda" - DEFAULT_REPOS = [productName.split('-')[0].lower(), - "fedora-modular-server", - "rawhide", -- "BaseOS"] -+ "BaseOS", # Used by RHEL -+ "baseos"] # Used by CentOS Stream - - # Get list of repo names which should be used as updates repos - DEFAULT_UPDATE_REPOS = ["updates", --- -2.30.2 - diff --git a/SOURCES/0003-Fix-CDN-button-visibility.patch b/SOURCES/0003-Fix-CDN-button-visibility.patch new file mode 100644 index 0000000..7c4283e --- /dev/null +++ b/SOURCES/0003-Fix-CDN-button-visibility.patch @@ -0,0 +1,56 @@ +From a93b04f012cd0e9f6b78499c3434a1018c2a2984 Mon Sep 17 00:00:00 2001 +From: Martin Kolman +Date: Fri, 11 Sep 2020 15:27:59 +0200 +Subject: [PATCH 3/4] 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.30.2 + diff --git a/SOURCES/0004-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch b/SOURCES/0004-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch new file mode 100644 index 0000000..22db6fc --- /dev/null +++ b/SOURCES/0004-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch @@ -0,0 +1,32 @@ +From b1772cf9f055b0ad2ad253f9f54f64627aa8ba6f Mon Sep 17 00:00:00 2001 +From: Jiri Konecny +Date: Mon, 26 Apr 2021 18:41:43 +0200 +Subject: [PATCH 4/4] Add base repo name for CentOS Stream after repository + renaming + +CentOS Stream renamed the repository to make everything consistent. For that we +have to keep old repository name for RHEL but also we need the new one for +CentOS Stream. + +Resolves: rhbz#1946347 +--- + pyanaconda/core/constants.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py +index a0099451bd..9c56068e9e 100644 +--- a/pyanaconda/core/constants.py ++++ b/pyanaconda/core/constants.py +@@ -60,7 +60,8 @@ BASE_REPO_NAME = "anaconda" + DEFAULT_REPOS = [productName.split('-')[0].lower(), + "fedora-modular-server", + "rawhide", +- "BaseOS"] ++ "BaseOS", # Used by RHEL ++ "baseos"] # Used by CentOS Stream + + # Get list of repo names which should be used as updates repos + DEFAULT_UPDATE_REPOS = ["updates", +-- +2.30.2 + diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 515e9a4..765f5c1 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 33.16.4.15 -Release: 1%{?dist}.0.1 +Release: 1%{?dist}.0.2 License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -14,12 +14,13 @@ Source0: %{name}-%{version}.tar.bz2 # https://github.com/rhinstaller/anaconda/pull/3315 Patch10001: 0001-Add-CentOS-Stream-config.patch +Patch10002: 0002-Enable-closest-mirror-in-CentOS-Stream-config.patch # https://github.com/rhinstaller/anaconda/pull/3020 -Patch10002: 0002-Fix-CDN-button-visibility.patch +Patch10003: 0003-Fix-CDN-button-visibility.patch # https://github.com/rhinstaller/anaconda/pull/3313 -Patch10003: 0003-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch +Patch10004: 0004-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch # Versions of required components (done so we make sure the buildrequires