diff --git a/.gitignore b/.gitignore index d22e3e5..ad88cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,5 @@ /subscription-manager-cockpit-1.29.14.tar.gz /subscription-manager-1.29.15.tar.gz /subscription-manager-cockpit-1.29.15.tar.gz +/subscription-manager-1.29.16.tar.gz +/subscription-manager-cockpit-1.29.16.tar.gz diff --git a/sources b/sources index 6008f07..9df9d2d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.29.15.tar.gz) = cfa2c5ec04392767336df9a2aefb683f5da15a95a0d7d2886235ad79d9053b291f7736ff12779abbb22fae49accb426743bcc4d3b075837524f20aa56595f7d3 -SHA512 (subscription-manager-cockpit-1.29.15.tar.gz) = ab153982d7d7023a7c993378aef91a1f8ce7c8206e2b75e8004688d31fb6c3f751bb3a06ada5f4f5c5780c4b290c8b12543dde5e14ea1d836ec5877fe783b679 +SHA512 (subscription-manager-1.29.16.tar.gz) = 4c0f07990416b3ca8197ddfdff16f12916d83c330ba1db9b41578ec1d13880c89cd911cc61a425be7be480c80061b5e90b31606e20175a721e03ea51dc1ba6f5 +SHA512 (subscription-manager-cockpit-1.29.16.tar.gz) = 1e6abd7b9e4d25a1721802d2a9a994605a8537499f19cb79888203c18203d246b5cf2fddc8d7e148b2e92593e9260724f9252d7b1ef5047a419cfa79f23d4dc3 diff --git a/subscription-manager.spec b/subscription-manager.spec index 3ba600e..bf9dae9 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -247,7 +247,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.29.15 +Version: 1.29.16 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -321,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 @@ -368,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 @@ -406,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 @@ -653,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. @@ -698,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 @@ -799,6 +807,21 @@ 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 +BuildArch: noarch +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 @@ -956,8 +979,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 @@ -1121,8 +1142,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* @@ -1132,8 +1151,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__ @@ -1208,7 +1225,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif %endif - %if %{use_subman_gui} %files -n subscription-manager-gui %defattr(-,root,root,-) @@ -1372,6 +1388,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 @@ -1533,6 +1559,28 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Jul 02 2021 Christopher Snyder 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 1.29.15-1 - 1941904: actually disable initial-setup in RHEL >= 9, and Fedora too (#2675) (ptoscano@redhat.com)