diff --git a/.anaconda.metadata b/.anaconda.metadata index aa98b79..58b7fe7 100644 --- a/.anaconda.metadata +++ b/.anaconda.metadata @@ -1 +1 @@ -c7cdac90390b3bb8d66bfc228df087585ebc453e SOURCES/anaconda-33.16.5.3.tar.bz2 +8bd710dfd255fe3cedafc806034e18912ff75bb2 SOURCES/anaconda-33.16.5.4.tar.bz2 diff --git a/.gitignore b/.gitignore index 64a5a1b..0868b30 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/anaconda-33.16.5.3.tar.bz2 +SOURCES/anaconda-33.16.5.4.tar.bz2 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 deleted file mode 100644 index 73f1cc2..0000000 --- a/SOURCES/0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 7ae6dfb..157740b 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 33.16.5.3 +Version: 33.16.5.4 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -12,9 +12,6 @@ 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). @@ -84,7 +81,7 @@ The anaconda package is a metapackage for the Anaconda installer. Summary: Core of the Anaconda installer Requires: python3-libs Requires: python3-dnf >= %{dnfver} -Requires: python3-blivet >= 1:3.2.2-1 +Requires: python3-blivet >= 1:3.4.0-1 Requires: python3-blockdev >= %{libblockdevver} Requires: python3-meh >= %{mehver} Requires: libreport-anaconda >= 2.0.21-1 @@ -104,7 +101,6 @@ Requires: python3-systemd Requires: python3-productmd Requires: python3-dasbus >= %{dasbusver} Requires: flatpak-libs -# https://github.com/rhinstaller/anaconda/pull/3534 %if %{defined rhel} && %{undefined centos} Requires: python3-syspurpose Requires: subscription-manager >= 1.26 @@ -371,6 +367,24 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Aug 02 2021 Radek Vykydal - 33.16.5.4-1 +- Disable anaconda-core's requirement on subscription-manager on CentOS (carl) + Resolves: rhbz#1984958 +- Show suggestions for an error caused by inconsistent sector sizes (vponcova) + Resolves: rhbz#1935722 +- Use a custom stylesheet to define CentOS-specific stylesheet data (carl) + Related: rhbz#1974149 +- Use RHEL help content for RHV/Ovirt (mkolman) + Resolves: rhbz#1915910 +- Move post installation scripts to the end of queue (lveyde) + Resolves: rhbz#1970879 +- Do not generate dracut arguments multiple times for some storage devices + (rvykydal) + Related: rhbz#1937208 +- Make failure in generating of dracut arguments for iSCSI device non-fatal. + (rvykydal) + Resolves: rhbz#1937208 + * Thu Jul 01 2021 Radek Vykydal - 33.16.5.3-1 - Check source type directly, not via DBus (mkolman) Resolves: rhbz#1941578