Update subscription-manager to 1.29.25-1

Resolves: #2046516 - register: do not check environments w/ activation keys
Resolves: #1935446 - Use updated cert with SHA256 algorithm (jhnidek@redhat.com)
Resolves: #2035662 - facts: tweak message for dmidecode warnings (ptoscano@redhat.com)
Resolves: #2041968 - Update man and help for environments options (wpoteat@redhat.com)

.gitignore

@@ -149,3 +149,5 @@
 /subscription-manager-cockpit-1.29.21.tar.gz
 /subscription-manager-1.29.23.tar.gz
 /subscription-manager-cockpit-1.29.23.tar.gz
+/subscription-manager-1.29.25.tar.gz
+/subscription-manager-cockpit-1.29.25.tar.gz

sources

@@ -1,2 +1,2 @@
-SHA512 (subscription-manager-1.29.23.tar.gz) = c60b1dd9c00f69ad87bc7e59cf0ba09c36a84f7a307339c305bd9f3f294c43faa3af3fff7b0ef2d6b3db5c420b870d858bcd04370b5c3bee993601548eba84b8
-SHA512 (subscription-manager-cockpit-1.29.23.tar.gz) = 04c800a6a04432eff2436ccdc7e8df50cb60f20d38a6bb0dc880da74fa0965a04846473eda8f9b31092d84cab1a448d68848a14148c1e8ed6ea8eb6b597f9c11
+SHA512 (subscription-manager-1.29.25.tar.gz) = 1524a76644e23d837f056c6292aa0ef8776a47781fd81a2ee70b1d1f3385922bbf3acf1416d11f4e605f1a390eac9eb6ef866c12015369956899de6f6767f8cc
+SHA512 (subscription-manager-cockpit-1.29.25.tar.gz) = 81121e557a376602e4754603eeb29a6f927ebdbb7a9283e9417da5f4686da8d6738e4b73bd86817df60f2e4f6d211e8be8160a02f606545f25430674d0b19879

subscription-manager.spec

@@ -67,8 +67,6 @@
 %global install_dnf_plugins INSTALL_DNF_PLUGINS=false
 %endif
 
-%global with_systemd WITH_SYSTEMD=true
-
 %if %{use_cockpit}
 %global with_cockpit WITH_COCKPIT=true
 %else
@@ -111,7 +109,7 @@
 %global use_rhsm_icons 0%{use_cockpit}
 
 Name: subscription-manager
-Version: 1.29.23
+Version: 1.29.25
 Release: 1%{?dist}
 Summary: Tools and libraries for subscription and repository management
 %if 0%{?suse_version}
@@ -157,7 +155,6 @@ Requires:  %{py_package_prefix}-iniparse
 Requires:  %{py_package_prefix}-decorator
 Requires:  virt-what
 Requires:  %{rhsm_package_name} = %{version}
-Requires:  %{py_package_prefix}-six
 
 %if 0%{?suse_version}
 Requires: %{py_package_prefix}-python-dateutil
@@ -213,7 +210,6 @@ BuildRequires: %{py_package_prefix}-setuptools
 BuildRequires: gettext
 BuildRequires: intltool
 BuildRequires: libnotify-devel
-BuildRequires: %{py_package_prefix}-six
 
 %if %{use_cockpit}
 BuildRequires: desktop-file-utils
@@ -365,7 +361,6 @@ Requires:  %{py_package_prefix}-python-dateutil
 Requires: %{py_package_prefix}-dateutil
 %endif
 Requires: %{py_package_prefix}-iniparse
-Requires: %{py_package_prefix}-six
 Requires: subscription-manager-rhsm-certificates = %{version}-%{release}
 # Required by Fedora packaging guidelines
 %{?python_provide:%python_provide %{py_package_prefix}-rhsm}
@@ -482,7 +477,6 @@ make -f Makefile install VERSION=%{version}-%{release} \
     %{?install_ostree} %{?install_container} \
     %{?install_dnf_plugins} \
     %{?install_zypper_plugins} \
-    %{?with_systemd} \
     %{?with_cockpit} \
     %{?subpackages} \
     %{?exclude_packages}
@@ -867,9 +861,47 @@ fi
 # Remove old *.egg-info empty directories not removed be previous versions of RPMs
 # due to this BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1927245
 rmdir %{python_sitearch}/subscription_manager-*-*.egg-info --ignore-fail-on-non-empty
-
+# Remove old cache files
+# The -f flag ensures that exit code 0 will be returned even if the file does not exist.
+rm -f /var/lib/rhsm/cache/rhsm_icon.json
 
 %changelog
+* Fri Feb 11 2022 Christopher Snyder <csnyder@redhat.com> 1.29.25-1
+- 2046516: register: do not check environments w/ activation keys
+  (ptoscano@redhat.com)
+- No-op refactor of RegisterCommand._process_environments()
+  (ptoscano@redhat.com)
+- 1935446: Use updated cert with SHA-256 algorithm (jhnidek@redhat.com)
+- build: pin pytest to < 7 (ptoscano@redhat.com)
+- Update translation files (noreply@weblate.org)
+
+* Thu Feb 10 2022 Christopher Snyder <csnyder@redhat.com> 1.29.24-1
+- 2023430: Cockpit: another improvement of curtain view (jhnidek@redhat.com)
+- environments: fix list for account in env-less org (ptoscano@redhat.com)
+- Reverting disabling AutoAttach() and PoolAttach() in SCA mode
+  (jhnidek@redhat.com)
+- 2023430: cockpit: improve handling of main curtain view (ptoscano@redhat.com)
+- Squelch DeprecationWarning's when importing pyinotify (ptoscano@redhat.com)
+- Drop tox.ini, no more needed now (ptoscano@redhat.com)
+- flake8: improve, and integrate bits from tox.ini (ptoscano@redhat.com)
+- flake8: misc fixes in tito/tests (ptoscano@redhat.com)
+- 2035662: facts: tweak message for dmidecode warnings (ptoscano@redhat.com)
+- facts: improve/tweak logging of warnings (ptoscano@redhat.com)
+- jenkins: use custom settings for the RH internal npmjs repo
+  (ptoscano@redhat.com)
+- jenkins: switch away from readFile() (ptoscano@redhat.com)
+- jenkins: simplify script filenames & labels (ptoscano@redhat.com)
+- jenkins: remove old scripts (ptoscano@redhat.com)
+- ENT-4671: Improve debug logging to stdout (mhorky@redhat.com)
+- Drop non-systemd support (ptoscano@redhat.com)
+- ENT-4650: Remove python-six from build system (mhorky@redhat.com)
+- ENT-4093: Fix flake8 warning W605 (mhorky@redhat.com)
+- ENT-4618: Switch away from six.get_method_* (mhorky@redhat.com)
+- ENT-4414: Remove RhsmIconCache (mhorky@redhat.com)
+- New extraction for translatable strings (ptoscano@redhat.com)
+- ENT-4589: Switch away from six.reraise (mhorky@redhat.com)
+- 2041968: Update man and help for environments options (wpoteat@redhat.com)
+
 * Mon Jan 17 2022 Christopher Snyder <csnyder@redhat.com> 1.29.23-1
 - Ignore debian architecture ALL (schmidt@atix.de)
 - 2028894: Don't allow service-level --serverurl on registered system