From e466f0f365348f26f4121a23dbb627aa561eed47 Mon Sep 17 00:00:00 2001 From: Carl George Date: Sep 24 2020 15:13:46 +0000 Subject: CentOS debranding --- diff --git a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch new file mode 100644 index 0000000..687f3a4 --- /dev/null +++ b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch @@ -0,0 +1,42 @@ +From 4dd22c6aad986c49c313999332c3791d581a1e92 Mon Sep 17 00:00:00 2001 +From: Brian Stinson +Date: Thu, 25 Jun 2020 18:10:13 -0500 +Subject: [PATCH] Add product data for CentOS Stream + +--- + data/product.d/centos-stream.conf | 7 +++++++ + tests/nosetests/pyanaconda_tests/product_test.py | 4 ++++ + 2 files changed, 11 insertions(+) + create mode 100644 data/product.d/centos-stream.conf + +diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf +new file mode 100644 +index 000000000..c65fcbbdf +--- /dev/null ++++ b/data/product.d/centos-stream.conf +@@ -0,0 +1,7 @@ ++# Anaconda configuration file for CentOS Stream. ++ ++[Product] ++product_name = CentOS Stream ++ ++[Base Product] ++product_name = CentOS Linux +diff --git a/tests/nosetests/pyanaconda_tests/product_test.py b/tests/nosetests/pyanaconda_tests/product_test.py +index f2203f431..5967141bc 100644 +--- a/tests/nosetests/pyanaconda_tests/product_test.py ++++ b/tests/nosetests/pyanaconda_tests/product_test.py +@@ -118,6 +118,10 @@ class ProductConfigurationTestCase(unittest.TestCase): + "CentOS Linux", "", + ["rhel.conf", "centos.conf"] + ) ++ self._check_default_product( ++ "CentOS Stream", "", ++ ["rhel.conf", "centos.conf", "centos-stream.conf"] ++ ) + self._check_default_product( + "Red Hat Virtualization", "", + ["rhel.conf", "rhev.conf"] +-- +2.26.2 + diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 81306a8..b5466dd 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -12,6 +12,9 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 +# https://github.com/rhinstaller/anaconda/pull/2689 +Patch104: 0001-Add-product-data-for-CentOS-Stream.patch + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -264,6 +267,9 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %autosetup -p 1 +# debranding +sed -e 's/RHEL/CentOS/' -i po/*.po + %build # use actual build-time release number, not tarball creation time release number %configure ANACONDA_RELEASE=%{release}