From 884371ab75aa9ac4fa2120a1db7493cd03c92433 Mon Sep 17 00:00:00 2001 From: Carl George Date: Jul 28 2021 14:58:08 +0000 Subject: CentOS modifications https://github.com/rhinstaller/anaconda/pull/3477 https://github.com/rhinstaller/anaconda/pull/3534 --- diff --git a/SOURCES/0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch b/SOURCES/0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch new file mode 100644 index 0000000..73f1cc2 --- /dev/null +++ b/SOURCES/0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch @@ -0,0 +1,31 @@ +From a9193e649be010130d57fc6b49427f329e20fb69 Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Fri, 9 Jul 2021 17:09:28 -0500 +Subject: [PATCH] Use a custom stylesheet to define CentOS-specific stylesheet + data + +Use a stylesheet provided by the centos-logos package. This is adapted +from #3179, which is intended for RHEL9+, but CentOS Stream 8 is going +to take advantage of that approach as well. + +Related: rhbz#1974149 +--- + data/product.d/centos-stream.conf | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf +index 723a484038..c9eefe8a6d 100644 +--- a/data/product.d/centos-stream.conf ++++ b/data/product.d/centos-stream.conf +@@ -29,6 +29,8 @@ default_help_pages = + centos_help_placeholder.xml + centos_help_placeholder.xml + ++custom_stylesheet = /usr/share/anaconda/pixmaps/redhat.css ++ + [Payload] + enable_closest_mirror = True + default_source = CLOSEST_MIRROR +-- +2.31.1 + diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 27af6e0..7ae6dfb 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/3477 +Patch10001: 0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -101,7 +104,8 @@ Requires: python3-systemd Requires: python3-productmd Requires: python3-dasbus >= %{dasbusver} Requires: flatpak-libs -%if 0%{?rhel} +# https://github.com/rhinstaller/anaconda/pull/3534 +%if %{defined rhel} && %{undefined centos} Requires: python3-syspurpose Requires: subscription-manager >= 1.26 %endif