Merge branch 'c9' into a9

This commit is contained in:
eabdullin 2022-08-09 09:35:30 +00:00 committed by Stepan Oksanichenko
commit fb8aa23363
3 changed files with 27 additions and 17 deletions

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/subscription-manager-1.29.26.tar.gz
SOURCES/subscription-manager-cockpit-1.29.26.tar.gz
SOURCES/subscription-manager-1.29.26.1.tar.gz
SOURCES/subscription-manager-cockpit-1.29.26.1.tar.gz

View File

@ -1,2 +1,2 @@
eb788e689741fa976be3df743e2292e2caffc5c8 SOURCES/subscription-manager-1.29.26.tar.gz
9cdeb5f8860579d5e218ebd546646540f93cc174 SOURCES/subscription-manager-cockpit-1.29.26.tar.gz
373802bc76f04337cbd0531a63189228144d385b SOURCES/subscription-manager-1.29.26.1.tar.gz
076bbd821910ce4ee48ca5fa0ebdb0ca3d137496 SOURCES/subscription-manager-cockpit-1.29.26.1.tar.gz

View File

@ -11,9 +11,7 @@
%global use_container_plugin 1
%endif
%if (0%{?rhel} || 0%{?fedora})
%global dmidecode_version >= 3.12.2-2
%endif
%global dmidecode_arches %{ix86} x86_64
%global completion_dir %{_datadir}/bash-completion/completions
@ -110,8 +108,8 @@
%global use_rhsm_icons 0%{use_cockpit}
Name: subscription-manager
Version: 1.29.26
Release: 3%{?dist}
Version: 1.29.26.1
Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management
%if 0%{?suse_version}
Group: Productivity/Networking/System
@ -162,6 +160,9 @@ Requires: %{py_package_prefix}-iniparse
Requires: %{py_package_prefix}-decorator
Requires: virt-what
Requires: %{rhsm_package_name} = %{version}
%ifarch %{dmidecode_arches}
Requires: dmidecode
%endif
%if 0%{?suse_version}
Requires: %{py_package_prefix}-python-dateutil
@ -176,11 +177,6 @@ Requires: %{py_package_prefix}-dateutil
Requires: %{py_package_prefix}-dbus
Requires: usermode
Requires: python3-gobject-base
# There's no dmi to read on these arches, so don't pull in this dep.
# Additionally, dmidecode isn't packaged at all on SUSE
%ifnarch aarch64 ppc ppc64 ppc64le s390 s390x
Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version}
%endif
%endif
# rhel 8 has different naming for setuptools going forward
@ -452,8 +448,8 @@ License: GPL-2.0
License: GPLv2
%endif
Requires: python3-requests
%ifnarch aarch64 ppc ppc64 ppc64le s390 s390x
Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version}
%ifarch %{dmidecode_arches}
Requires: dmidecode
%endif
%description -n python3-cloud-what
@ -897,9 +893,23 @@ rmdir %{python_sitearch}/subscription_manager-*-*.egg-info --ignore-fail-on-non-
rm -f /var/lib/rhsm/cache/rhsm_icon.json
%changelog
* Tue May 17 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1.29.26-3.alma
* Tue Aug 09 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1.29.26.1-1.alma
- Debrand for AlmaLinux
* Mon Jul 18 2022 Christopher Snyder <csnyder@redhat.com> 1.29.26.1-1
- ENT-5215: Handle all exceptions caused by network problems
(mhorky@redhat.com)
- ENT-5215: Handle errors raised in DNF plugin (mhorky@redhat.com)
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com)
- Translated using Weblate (Korean) (simmon@nplob.com)
- zypper: drop dead python-dmidecode usage (ptoscano@redhat.com)
- facts: drop DmiFirmwareInfoCollector (ptoscano@redhat.com)
- facts: switch to DmidecodeFactCollector for DMI facts (ptoscano@redhat.com)
- facts: add dmidecode parser and facts collector (ptoscano@redhat.com)
- cloud-what: switch MiniHostCollector to dmidecode(1) (ptoscano@redhat.com)
- 2095301: enable sslverifystatus on repos if advertized by CP
(ptoscano@redhat.com)
- RepoUpdateActionCommand: lazy load the consumer auth (ptoscano@redhat.com)
* Wed Apr 13 2022 Christopher Snyder <csnyder@redhat.com> 1.29.26-3
- refresh: clear also the release status (ptoscano@redhat.com)
- 2073551: clear the release cache on release change (ptoscano@redhat.com)