From 16163525f1f4f69bfe54ba08b5b987c9b17c5a1a Mon Sep 17 00:00:00 2001 From: Carl George Date: Apr 26 2021 17:14:06 +0000 Subject: Add another upstream patch https://github.com/rhinstaller/anaconda/pull/3313 --- diff --git a/SOURCES/0001-Add-CentOS-Stream-config.patch b/SOURCES/0001-Add-CentOS-Stream-config.patch index 50b74df..6a11e90 100644 --- a/SOURCES/0001-Add-CentOS-Stream-config.patch +++ b/SOURCES/0001-Add-CentOS-Stream-config.patch @@ -1,7 +1,7 @@ -From 46aef94345d4c3e5a0be103fcf75650c67cbf14f Mon Sep 17 00:00:00 2001 +From cf1a449f229217f169d61f65b9719b9923aa02df Mon Sep 17 00:00:00 2001 From: Pat Riehecky Date: Mon, 23 Nov 2020 13:50:06 -0600 -Subject: [PATCH 1/2] Add CentOS Stream config +Subject: [PATCH 1/3] Add CentOS Stream config https://github.com/rhinstaller/anaconda/pull/3014 https://github.com/rhinstaller/anaconda/commit/150bbc179cf51226d6c1bd46279e076ff683ec03 @@ -117,5 +117,5 @@ index 55f3e0dde7..45d532bda1 100644 ) self._check_default_product( -- -2.29.2 +2.30.2 diff --git a/SOURCES/0002-Fix-CDN-button-visibility.patch b/SOURCES/0002-Fix-CDN-button-visibility.patch index 26ea1bf..9683155 100644 --- a/SOURCES/0002-Fix-CDN-button-visibility.patch +++ b/SOURCES/0002-Fix-CDN-button-visibility.patch @@ -1,7 +1,7 @@ -From 9efb90902967e207bdca8ac61ab92de54fbae9fe Mon Sep 17 00:00:00 2001 +From c7a02a91a28e848ffc2a656009fc699c15541ca6 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Fri, 11 Sep 2020 15:27:59 +0200 -Subject: [PATCH 2/2] Fix CDN button visibility +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 @@ -52,5 +52,5 @@ index 6aab9b387a..d0d4da72b9 100644 # Get the current source. source_proxy = self.payload.get_source_proxy() -- -2.29.2 +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 new file mode 100644 index 0000000..96c80a9 --- /dev/null +++ b/SOURCES/0003-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch @@ -0,0 +1,32 @@ +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/SPECS/anaconda.spec b/SPECS/anaconda.spec index ec74677..515e9a4 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} +Release: 1%{?dist}.0.1 License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -12,12 +12,15 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 -# https://github.com/rhinstaller/anaconda/pull/3014 +# https://github.com/rhinstaller/anaconda/pull/3315 Patch10001: 0001-Add-CentOS-Stream-config.patch # https://github.com/rhinstaller/anaconda/pull/3020 Patch10002: 0002-Fix-CDN-button-visibility.patch +# https://github.com/rhinstaller/anaconda/pull/3313 +Patch10003: 0003-Add-base-repo-name-for-CentOS-Stream-after-repositor.patch + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things).