diff --git a/.gitignore b/.gitignore index 79616ab..a51984b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.28.17.tar.gz -SOURCES/subscription-manager-cockpit-1.28.17.tar.gz +SOURCES/subscription-manager-1.28.19.tar.gz +SOURCES/subscription-manager-cockpit-1.28.19.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index e970f2b..5521d5a 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -6a0531614481fd4603a6f6e4f7a4bc26ba2097ca SOURCES/subscription-manager-1.28.17.tar.gz -23c9343d6a1c5f024ca4c9a143755713d0b6f89a SOURCES/subscription-manager-cockpit-1.28.17.tar.gz +5d95b1a94f1144a8f6c6da032fc5b55a3abd66b4 SOURCES/subscription-manager-1.28.19.tar.gz +f631ea6339abd9b886823a6220c9a668e446b6d0 SOURCES/subscription-manager-cockpit-1.28.19.tar.gz diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index d0d9d18..be0fd1f 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -243,7 +243,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.28.17 +Version: 1.28.19 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -318,8 +318,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 @@ -359,6 +357,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 @@ -638,6 +638,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 @@ -738,6 +739,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 @@ -899,8 +914,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 @@ -1051,8 +1064,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* @@ -1062,8 +1073,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__ @@ -1306,6 +1315,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 @@ -1465,6 +1484,52 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Jul 14 2021 Christopher Snyder 1.28.19-1 +- Translated using Weblate (German) (ljanda@redhat.com) +- Translated using Weblate (German) (patrick.vollandt@mein-gym.de) +- Translated using Weblate (Korean) (simmon@nplob.com) +- Remove no arch from python3-cloud-what package (csnyder@redhat.com) +- 1976324: Added cloud_what to log root namespaces (#2704) (jhnidek@redhat.com) + +* Mon Jul 12 2021 Christopher Snyder 1.28.18-1 +- Removed .orig files, which leaked into main branch (jhnidek@redhat.com) +- Move cloud detector/collector to cloud-what package (jhnidek@redhat.com) +- Make Azure cloud collector more reliable (jhnidek@redhat.com) +- Translated using Weblate (Korean) (simmon@nplob.com) +- Update translation files (noreply@weblate.org) +- Fixed reporting of AWS cloud facts (null value) (#2693) (jhnidek@redhat.com) +- New extraction for translatable strings (#2688) (ptoscano@redhat.com) +- Refactoring of cloud collector/detector and facts (#2657) + (jhnidek@redhat.com) +- 1973731: fix wording on error when listing syspurpose values + (ptoscano@redhat.com) +- 1971693: syspurpose: remove deprecation notices (#2683) (ptoscano@redhat.com) +- 1968420: improve description of rhsm.conf format (ptoscano@redhat.com) +- 1967210: Do not print warning, when valid value is provided + (jhnidek@redhat.com) +- Translated using Weblate (Korean) (simmon@nplob.com) +- 1971693: syspurpose: adjust deprecation messages (ptoscano@redhat.com) +- Translated using Weblate (Korean) (simmon@nplob.com) +- Translated using Weblate (Korean) (ljanda@redhat.com) +- Update translation files (noreply@weblate.org) +- Fixed white space before '(' (jhnidek@redhat.com) +- flake8: add more locally found issues (ptoscano@redhat.com) +- Remove extra whitespace before '(' (ptoscano@redhat.com) +- 1967780: improve placeholders in help text (ptoscano@redhat.com) +- Add missing second empty line after class/function (ptoscano@redhat.com) +- New extraction for translatable strings (ptoscano@redhat.com) +- Add flake8 configuration (ptoscano@redhat.com) +- build: drop version requirements for pep8 and flake8 (ptoscano@redhat.com) +- build: remove pyqver test requirement (ptoscano@redhat.com) +- jenkins: disambiguate virtualenv names (ptoscano@redhat.com) +- jenkins: switch stylish job to Python 3 (ptoscano@redhat.com) +- cockpit: Invoke setup.py with python3 (martin@piware.de) +- 1897767: improve wording for invalid syspurpose values (ptoscano@redhat.com) +- Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com) +- Translated using Weblate (Korean) (ljanda@redhat.com) +- Translated using Weblate (Korean) (simmon@nplob.com) +- Translated using Weblate (Italian) (toscano.pino@tiscali.it) + * Mon Jun 07 2021 Christopher Snyder 1.28.17-1 - 1920020: show error message when setting invalid default_log_level as well as on every run until changed to a valid value (#2641)