diff --git a/.anaconda.metadata b/.anaconda.metadata index 2026bb5..81c258c 100644 --- a/.anaconda.metadata +++ b/.anaconda.metadata @@ -1 +1 @@ -664342f326bc9c7cf5380395e97525ab2c12a980 SOURCES/anaconda-33.16.4.6.tar.bz2 +c9969bb223e36a932a7d381783123a364485095f SOURCES/anaconda-33.16.4.8.tar.bz2 diff --git a/.gitignore b/.gitignore index af4aade..558d345 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/anaconda-33.16.4.6.tar.bz2 +SOURCES/anaconda-33.16.4.8.tar.bz2 diff --git a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch deleted file mode 100644 index 5c7ead4..0000000 --- a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 646ea4b2d75712f83086b9ca7b06bf543158c169 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 | 5 +++++ - 2 files changed, 12 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 0000000000..c65fcbbdf8 ---- /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 55f3e0dde7..d0c3adb849 100644 ---- a/tests/nosetests/pyanaconda_tests/product_test.py -+++ b/tests/nosetests/pyanaconda_tests/product_test.py -@@ -244,6 +244,11 @@ class ProductConfigurationTestCase(unittest.TestCase): - ["rhel.conf", "centos.conf"], - WORKSTATION_PARTITIONING - ) -+ self._check_default_product( -+ "CentOS Stream", "", -+ ["rhel.conf", "centos.conf", "centos-stream.conf"], -+ WORKSTATION_PARTITIONING -+ ) - self._check_default_product( - "Red Hat Virtualization", "", - ["rhel.conf", "rhev.conf"], --- -2.29.2 - diff --git a/SOURCES/0001-Fix-CDN-button-visibility.patch b/SOURCES/0001-Fix-CDN-button-visibility.patch deleted file mode 100644 index 6c9e3cb..0000000 --- a/SOURCES/0001-Fix-CDN-button-visibility.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c29802a2be591a4cdcc91ba86b74fc4d01087b72 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Fri, 11 Sep 2020 15:27:59 +0200 -Subject: [PATCH] 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 ---- - 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.29.2 - diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 1af4c00..7bea199 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 33.16.4.6 +Version: 33.16.4.8 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/2689 -Patch104: 0001-Add-product-data-for-CentOS-Stream.patch - -# https://github.com/rhinstaller/anaconda/pull/3020 -Patch105: 0001-Fix-CDN-button-visibility.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -271,9 +265,6 @@ 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} @@ -376,6 +367,28 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Jan 18 2021 Radek Vykydal - 33.16.4.8-1 +- network: handle wireless configure button sensitiveness (rvykydal) + Resolves: rhbz#1917437 + +* Thu Jan 14 2021 Martin Kolman - 33.16.4.7-1 +- Allow to disable the Security module (vponcova) + Resolves: rhbz#1913689 +- Allow to disable the Services module (vponcova) + Resolves: rhbz#1913689 +- Support should_run for standalone GUI spokes (vponcova) + Resolves: rhbz#1913689 +- Allow to disable the Localization module (vponcova) + Resolves: rhbz#1913689 +- Allow to disable the Timezone module (vponcova) + Resolves: rhbz#1913689 +- Allow to disable the network installation (vponcova) + Resolves: rhbz#1913689 +- Allow to disable the Users module (vponcova) + Resolves: rhbz#1913689 +- Always show pykickstart parse warnings (vslavik) + Resolves: rhbz#1897663 + * Mon Jan 11 2021 Martin Kolman - 33.16.4.6-1 - Initialize librepo logger (pkratoch) Resolves: rhbz#1908286