diff --git a/.anaconda.metadata b/.anaconda.metadata index 2a5e78f..aa98b79 100644 --- a/.anaconda.metadata +++ b/.anaconda.metadata @@ -1 +1 @@ -42186ae93c579b1dfa20f05e7f3f53b2c4812dea SOURCES/anaconda-33.16.5.2.tar.bz2 +c7cdac90390b3bb8d66bfc228df087585ebc453e SOURCES/anaconda-33.16.5.3.tar.bz2 diff --git a/.gitignore b/.gitignore index 3f6a7fa..64a5a1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/anaconda-33.16.5.2.tar.bz2 +SOURCES/anaconda-33.16.5.3.tar.bz2 diff --git a/SOURCES/0001-Fix-CDN-button-visibility.patch b/SOURCES/0001-Fix-CDN-button-visibility.patch deleted file mode 100644 index 2f30fff..0000000 --- a/SOURCES/0001-Fix-CDN-button-visibility.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 105134042d26ce62ecd39657f016e0b333d4aa68 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Fri, 11 Sep 2020 15:27:59 +0200 -Subject: [PATCH 1/2] 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.31.1 - diff --git a/SOURCES/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch b/SOURCES/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch deleted file mode 100644 index 8e7adf3..0000000 --- a/SOURCES/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 96351859cfd2030c4ab2f931f2f0a38190180e00 Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Wed, 10 Feb 2021 17:50:11 +0100 -Subject: [PATCH 2/2] Use a custom stylesheet to define RHEL-specific - stylesheet data - -Use a stylesheet provided by the rhel-logos package. ---- - data/product.d/rhel.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/product.d/rhel.conf b/data/product.d/rhel.conf -index c4de9b6a8a..5f69be1d45 100644 ---- a/data/product.d/rhel.conf -+++ b/data/product.d/rhel.conf -@@ -50,6 +50,7 @@ default_help_pages = - rhel_help_placeholder.xml - rhel_help_placeholder.xml - -+custom_stylesheet = /usr/share/anaconda/pixmaps/redhat.css - blivet_gui_supported = False - - [License] --- -2.31.1 - diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index a1570f6..27af6e0 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda -Version: 33.16.5.2 -Release: 1%{?dist}.0.1 +Version: 33.16.5.3 +Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -12,12 +12,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 -# https://github.com/rhinstaller/anaconda/pull/3020 -Patch10001: 0001-Fix-CDN-button-visibility.patch - -# https://github.com/rhinstaller/anaconda/pull/3477 -Patch10002: 0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -107,7 +101,7 @@ Requires: python3-systemd Requires: python3-productmd Requires: python3-dasbus >= %{dasbusver} Requires: flatpak-libs -%if %{defined rhel} && %{undefined centos} +%if 0%{?rhel} Requires: python3-syspurpose Requires: subscription-manager >= 1.26 %endif @@ -373,6 +367,20 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Thu Jul 01 2021 Radek Vykydal - 33.16.5.3-1 +- Check source type directly, not via DBus (mkolman) + Resolves: rhbz#1941578 +- Remove autostep functionality (vslavik) + Resolves: rhbz#1976913 +- Make it possible to skip install time Insights errors (mkolman) + Resolves: rhbz#1931069 +- Fix CDN button visibility (mkolman) + Resolves: rhbz#1903178 +- network: do not bind virtual devices to mac (rvykydal) + Resolves: rhbz#1963834 +- Add a log message for successful installation (vslavik) + Resolves: rhbz#1949487 + * Mon May 24 2021 Radek Vykydal - 33.16.5.2-1 - Use modinfo to check ko before modprobe (t.feng94) Resolves: rhbz#1577544