Update subscription-manager to 1.29.17-1

Resolves: #1938878 - Fix issues discovered by static code analyzers (#2644)
Resolves: #1941904 - remove packages (#2692)
Resolves: #1975552 - add '[SUBMODULE]' in syspurpose usage string (ptoscano@redhat.com)
Resolves: #1973807 - fix wording on error when listing syspurpose values (#2684)
Resolves: #1975552 - remove extra '[OPTIONS]' from syspurpose usage string (#2682)
Resolves: #1967210 - Do not print warning, when valid value is provided
Resolves: #1968420 - improve description of rhsm.conf format (ptoscano@redhat.com)
Resolves: #1941904 - actually disable initial-setup in RHEL >= 9, and Fedora too (#2675)
Resolves: #1967780 - improve placeholders in help text (ptoscano@redhat.com)
Resolves: #1898563 - move syspurpose subcommands within the 'syspurpose' command
Resolves: #1941904 - disable initial-setup in RHEL >= 9 (ptoscano@redhat.com)
Resolves: #1959048 - improve wording for invalid syspurpose values (ptoscano@redhat.com)
Resolves: #1920020 - show error message when setting invalid default_log_level as well as
Resolves: #1959048 - improve wording for missing or empty syspurpose values
Resolves: #1960765 - fix typo "explicity" in man page (ptoscano@redhat.com)
Resolves: #1952879 - extract messages from argparse instead of optparse
Resolves: #1896715 - Set proper read permissions on certs (wpoteat@redhat.com)
Resolves: #1956654 - Fix issue with proxy and cockpit plugin (jhnidek@redhat.com)
Resolves: #1953069 - bash: fix listing of config options (#2609) (ptoscano@redhat.com)
Resolves: #1953047 - bash: drop completion for subscribe & unsubscribe
Resolves: #1952228 - fix formatting of log error messages (ptoscano@redhat.com)
Resolves: #1898552 - refactor/fix collection of IP v4/v6 address info
Resolves: #1819555 - cockpit: translate untranslatable messages (ptoscano@redhat.com)
Resolves: #1940658 - bash: complete also the syspurpose subcommand (ptoscano@redhat.com)
Resolves: #1878736 - use our i18n functions instead of dnf ones (ptoscano@redhat.com)
This commit is contained in:
Christopher Snyder 2021-07-13 09:40:37 -04:00
parent 88d63b51da
commit 9983241cb3
3 changed files with 162 additions and 22 deletions

2
.gitignore vendored
View File

@ -131,3 +131,5 @@
/subscription-manager-cockpit-1.29.9.tar.gz
/subscription-manager-1.29.10.tar.gz
/subscription-manager-cockpit-1.29.10.tar.gz
/subscription-manager-1.29.17.tar.gz
/subscription-manager-cockpit-1.29.17.tar.gz

View File

@ -1,2 +1,2 @@
SHA512 (subscription-manager-1.29.10.tar.gz) = 8417782bb059f125c9124e18347ebdf3a486b80009f2265a65903f07db554793a9f0fb247627c8c7859be1c8e4a1557d20dc035f80abcf7303d75da0270341f2
SHA512 (subscription-manager-cockpit-1.29.10.tar.gz) = 6a2c6c7c7e5837aa8f0be3dd5e6b0f7734ff153404fbdd70a040aa58bbfc1ca9332ed12b97f613905633872a8daac756f6ec4bfc22de6d49e72dca9002098238
SHA512 (subscription-manager-1.29.17.tar.gz) = e1f9244e0c2effa55e545c1b4b834475eb156e121a34f834667a5f315ba3deda863f7cf4371483d1a7f4a3f4b89bd4fe280d8ec150e25a195de5643b7d95adba
SHA512 (subscription-manager-cockpit-1.29.17.tar.gz) = dd41cb8c66744411c6165fc9a7ff948488484154ad71724701678bff35e40e5291872929a521875c7d4d704e141e793a7503c393e41b4a9ca4b9fa0b61e92ca0

View File

@ -93,6 +93,13 @@
%global use_inotify 0
%endif
# Do not ship initial-setup in RHEL 9+ and Fedora:
# - as Anaconda can now register during the installation
# - it uses old Anaconda APIs that are not supported anymore
%if 0%{?rhel} >= 9 || 0%{?fedora}
%global use_initial_setup 0
%endif
%if (%{use_subman_gui} || %{use_initial_setup} || %{use_firstboot})
%global use_rhsm_gtk 1
%else
@ -240,8 +247,8 @@
%global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
Name: subscription-manager
Version: 1.29.10
Release: 3%{?dist}
Version: 1.29.17
Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management
%if 0%{?suse_version}
Group: Productivity/Networking/System
@ -314,8 +321,6 @@ Requires: python3-dbus
Requires: %{?suse_version:dbus-1-python} %{!?suse_version:dbus-python}
%endif
Requires: python3-requests
%if %{use_yum}
Requires: %{?suse_version:yum} %{!?suse_version:yum >= 3.2.29-73}
%endif
@ -361,6 +366,8 @@ Requires(post): %{?suse_version:aaa_base} %{!?suse_version:chkconfig}
Requires(preun): %{?suse_version:aaa_base} %{!?suse_version:chkconfig, initscripts}
%endif
Requires: python3-cloud-what = %{version}-%{release}
BuildRequires: %{?suse_version:python-devel >= 2.6} %{!?suse_version:%{py_package_prefix}-devel}
BuildRequires: openssl-devel
BuildRequires: gcc
@ -399,6 +406,14 @@ BuildRequires: systemd-rpm-macros
BuildRequires: systemd
%endif
%if !%{use_initial_setup}
Obsoletes: subscription-manager-initial-setup-addon <= %{version}-%{release}
%endif
%if !%{use_rhsm_gtk}
Obsoletes: rhsm-gtk <= %{version}-%{release}
%endif
%if !%{use_container_plugin}
Obsoletes: subscription-manager-plugin-container
%endif
@ -646,7 +661,6 @@ Supplements: initial-setup-gui
This package contains the initial-setup screens for subscription-manager.
%endif
%if %has_ostree
%package -n subscription-manager-plugin-ostree
Summary: A plugin for handling OSTree content.
@ -691,6 +705,7 @@ Requires: subscription-manager-rhsm-certificates = %{version}-%{release}
# Required by Fedora packaging guidelines
%{?python_provide:%python_provide %{py_package_prefix}-rhsm}
%if %{with python3}
Requires: python3-cloud-what = %{version}-%{release}
Requires: python3-rpm
Provides: python3-rhsm = %{version}-%{release}
Obsoletes: python3-rhsm <= 1.20.3-1
@ -763,8 +778,9 @@ BuildArch: noarch
Requires: subscription-manager
Requires: cockpit-bridge
Requires: cockpit-shell
Requires: cockpit-ws
Requires: rhsm-icons
# Used by desktop UI, but not necessary for web UI
Recommends: cockpit-ws
%description -n subscription-manager-cockpit
Subscription Manager Cockpit UI
@ -791,6 +807,20 @@ of Red Hat subscriptions. There are many such interfaces, subscription-manager-g
subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugin primarily.
%endif
%package -n python3-cloud-what
Summary: Python package for detection of public cloud provider
License: GPLv2
Requires: python3-requests
%ifnarch aarch64 ppc ppc64 ppc64le s390 s390x
Requires: %{py_package_prefix}-dmidecode %{?dmidecode_version}
%endif
%description -n python3-cloud-what
This package contains a Python module for detection and collection of public
cloud metadata and signatures.
%prep
%setup -q
@ -948,8 +978,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%endif
%dir %{python_sitearch}/rhsmlib/candlepin
%dir %{python_sitearch}/rhsmlib/cloud
%dir %{python_sitearch}/rhsmlib/cloud/providers
%dir %{python_sitearch}/rhsmlib/compat
%dir %{python_sitearch}/rhsmlib/dbus
%dir %{python_sitearch}/rhsmlib/dbus/facts
@ -1113,8 +1141,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%dir %{python_sitearch}/rhsmlib
%{python_sitearch}/rhsmlib/*.py*
%{python_sitearch}/rhsmlib/candlepin/*.py*
%{python_sitearch}/rhsmlib/cloud/*.py*
%{python_sitearch}/rhsmlib/cloud/providers/*.py*
%{python_sitearch}/rhsmlib/compat/*.py*
%{python_sitearch}/rhsmlib/facts/*.py*
%{python_sitearch}/rhsmlib/services/*.py*
@ -1124,8 +1150,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%if %{with python3}
%{python_sitearch}/rhsmlib/__pycache__
%{python_sitearch}/rhsmlib/candlepin/__pycache__
%{python_sitearch}/rhsmlib/cloud/__pycache__
%{python_sitearch}/rhsmlib/cloud/providers/__pycache__
%{python_sitearch}/rhsmlib/compat/__pycache__
%{python_sitearch}/rhsmlib/dbus/__pycache__
%{python_sitearch}/rhsmlib/dbus/facts/__pycache__
@ -1200,7 +1224,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%endif
%endif
%if %{use_subman_gui}
%files -n subscription-manager-gui
%defattr(-,root,root,-)
@ -1364,6 +1387,16 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%{python2_sitearch}/rhsm/*
%endif
%files -n python3-cloud-what
%defattr(-,root,root,-)
%dir %{python_sitearch}/cloud_what
%dir %{python_sitearch}/cloud_what/providers
%{python_sitearch}/cloud_what/*
%if %{with python3}
%{python_sitearch}/cloud_what/__pycache__
%{python_sitearch}/cloud_what/providers/__pycache__
%endif
%files -n subscription-manager-rhsm-certificates
%attr(755,root,root) %dir %{_sysconfdir}/rhsm
%attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca
@ -1396,9 +1429,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%pre
# 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 2> /dev/null || true
%if %use_systemd
%if 0%{?suse_version}
@ -1502,6 +1532,11 @@ fi
%endif
%endif
%posttrans
# 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
%if %{use_subman_gui}
%postun -n subscription-manager-gui
if [ $1 -eq 0 ] ; then
@ -1523,11 +1558,114 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 1.29.10-3
- Rebuild for versioned symbols in json-c
* Thu Jul 08 2021 Christopher Snyder <csnyder@redhat.com> 1.29.17-1
- Remove no arch from python3-cloud-what package (csnyder@redhat.com)
- 1938878: Fix issues discovered by static code analyzers (#2644)
(jhnidek@redhat.com)
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.29.10-2
- Rebuilt for Python 3.10
* Fri Jul 02 2021 Christopher Snyder <csnyder@redhat.com> 1.29.16-1
- 1941904: remove packages (#2692)
(31166354+tlhmerry9@users.noreply.github.com)
- Translated using Weblate (Korean) (simmon@nplob.com)
- Update translation files (noreply@weblate.org)
- Translated using Weblate (Korean) (simmon@nplob.com)
- Update translation files (noreply@weblate.org)
- New extraction for translatable strings (ptoscano@redhat.com)
- Move cloud detector/collector to cloud-what package (#2680)
(jhnidek@redhat.com)
- 1975552: add '[SUBMODULE]' in syspurpose usage string (ptoscano@redhat.com)
- New extraction for translatable strings (ptoscano@redhat.com)
- 1973807: fix wording on error when listing syspurpose values (#2684)
(ptoscano@redhat.com)
- 1975552: remove extra '[OPTIONS]' from syspurpose usage string (#2682)
(ptoscano@redhat.com)
- Make Azure cloud collector more reliable (#2645) (jhnidek@redhat.com)
- 1967210: Do not print warning, when valid value is provided
(jhnidek@redhat.com)
- 1968420: improve description of rhsm.conf format (ptoscano@redhat.com)
- Delete server repo file (suttner@atix.de)
* Fri Jun 18 2021 Christopher Snyder <csnyder@redhat.com> 1.29.15-1
- 1941904: actually disable initial-setup in RHEL >= 9, and Fedora too (#2675)
(ptoscano@redhat.com)
* Wed Jun 16 2021 Christopher Snyder <csnyder@redhat.com> 1.29.14-1
- Drop more files/references of old standalone syspurpose tool
(ptoscano@redhat.com)
- 1967780: improve placeholders in help text (ptoscano@redhat.com)
- Update translation files (noreply@weblate.org)
- New extraction for translatable strings (ptoscano@redhat.com)
- 1898563: move syspurpose subcommands within the 'syspurpose' command
(ptoscano@redhat.com)
- Rename internal variable for syspurpose --show (ptoscano@redhat.com)
- Drop command name from args when parsing them (ptoscano@redhat.com)
- 1941904: disable initial-setup in RHEL >= 9 (ptoscano@redhat.com)
- 1959048: improve wording for invalid syspurpose values (ptoscano@redhat.com)
- Enable subman to run normally in containers for development/test
(csnyder@redhat.com)
- Fixed reporting of AWS cloud facts (null value) (jhnidek@redhat.com)
- cockpit: Test also system purpose (mmarusak@redhat.com)
- cockpit: Use current PF4 components and design (mmarusak@redhat.com)
- test: Update cockpit test/common library (mmarusak@redhat.com)
- cockpit: Update babel (mmarusak@redhat.com)
- cockpit: Sync lib/patternfly with Cockpit (mmarusak@redhat.com)
* Mon Jun 07 2021 Christopher Snyder <csnyder@redhat.com> 1.29.13-1
- Updated translations for Korean, Chinese (simiplified, zh_CN), Italian
- Refactoring of cloud collector/detector and facts (#2515)
(jhnidek@redhat.com)
- 1920020: show error message when setting invalid default_log_level as well as
on every run until changed to a valid value (tmerry@redhat.com)
- 1959048: improve wording for missing or empty syspurpose values
(ptoscano@redhat.com)
- Update translation files (noreply@weblate.org)
- New extraction for translatable strings (ptoscano@redhat.com)
- 1960765: fix typo "explicity" in man page (ptoscano@redhat.com)
- cockpit: Lower cockpit-ws dependency to Recommends (martin@piware.de)
- test: Robustify and trim down cockpit-ws installation (martin@piware.de)
- jenkins: switch stylish job to Python 3 (ptoscano@redhat.com)
- flake8: add more locally found issues (ptoscano@redhat.com)
- Remove extra whitespace before '(' (ptoscano@redhat.com)
- 1952879: extract messages from argparse instead of optparse
(ptoscano@redhat.com)
- po: set Project-Id-Version to rhsm (ptoscano@redhat.com)
- po: fuzzy messages with invalid/missing placeholders (ptoscano@redhat.com)
- po: ko: manually fix placeholder (ptoscano@redhat.com)
- Update script reference to base branch to main (wpoteat@redhat.com)
- 1896715: Set proper read permissions on certs (wpoteat@redhat.com)
- cockpit: Use PF4 based empty state (mmarusak@redhat.com)
- cockpit: Drop uglification (mmarusak@redhat.com)
- cockpit: Use 'noreferrer' for external links (mmarusak@redhat.com)
- cockpit: Add `standard-jsx` eslint plugin (mmarusak@redhat.com)
- cockpit: Remove loaders for .es6 files (mmarusak@redhat.com)
- cockpit: Add package-lock.json to .gitignore (mmarusak@redhat.com)
- build: drop version requirements for pep8 and flake8 (ptoscano@redhat.com)
- build: remove pyqver test requirement (ptoscano@redhat.com)
- Add flake8 configuration (ptoscano@redhat.com)
- Add missing second empty line after class/function (ptoscano@redhat.com)
- Fix some over-indented code blocks (ptoscano@redhat.com)
- jenkins: disambiguate virtualenv names (ptoscano@redhat.com)
- 1956654: Fix issue with proxy and cockpit plugin (jhnidek@redhat.com)
- Releaser for Centos (wpoteat@redhat.com)
* Tue Apr 27 2021 Christopher Snyder <csnyder@redhat.com> 1.29.12-1
- 1953069: bash: fix listing of config options (#2609) (ptoscano@redhat.com)
- Cleanup old *.egg-info dirs in %%post (csnyder@redhat.com)
- 1953047: bash: drop completion for subscribe & unsubscribe
(ptoscano@redhat.com)
- 1952228: fix formatting of log error messages (ptoscano@redhat.com)
* Thu Apr 22 2021 William Poteat <wpoteat@redhat.com> 1.29.11-1
- Add subscription-manager dependency to apt-katello-transport (kolb@atix.de)
- 1898552: refactor/fix collection of IP v4/v6 address info
(ptoscano@redhat.com)
- cockpit: Enable TLS for mock insights server (martin@piware.de)
- adding timoeout to jenkins pipeline (#2585) (jmolet@redhat.com)
- New extraction for translatable strings (ptoscano@redhat.com)
- 1819555: cockpit: translate untranslatable messages (ptoscano@redhat.com)
- Replace hardcoded errno value with constant (ptoscano@redhat.com)
- 1940658: bash: complete also the syspurpose subcommand (ptoscano@redhat.com)
- 1878736: use our i18n functions instead of dnf ones (ptoscano@redhat.com)
* Tue Apr 13 2021 William Poteat <wpoteat@redhat.com> 1.29.10-1
- Switch dates returned by D-Bus ListInstalledProducts to ISO 8601