diff --git a/.gitignore b/.gitignore index c0875f2..f745096 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.28.9.tar.gz -SOURCES/subscription-manager-cockpit-1.28.9.tar.gz +SOURCES/subscription-manager-1.28.10.tar.gz +SOURCES/subscription-manager-cockpit-1.28.10.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 710f6b0..9c11345 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -fcfad1ce4ced59888c20b62a788ac4191d17ff3f SOURCES/subscription-manager-1.28.9.tar.gz -c1195e879cd25c06c0657c2e7b4bbeeaa57ca933 SOURCES/subscription-manager-cockpit-1.28.9.tar.gz +973222da4442cdac6bbae194e867eff6fe726aca SOURCES/subscription-manager-1.28.10.tar.gz +0f10598fa9bdadc3866d4c5b8cb4a336be80bbb7 SOURCES/subscription-manager-cockpit-1.28.10.tar.gz diff --git a/SOURCES/CENTOS-use-centos-syspurposes.patch b/SOURCES/CENTOS-use-centos-syspurposes.patch deleted file mode 100644 index 52d2e66..0000000 --- a/SOURCES/CENTOS-use-centos-syspurposes.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json -index 1ac7ea0e..305ec4b9 100644 ---- a/etc-conf/syspurpose/valid_fields.json -+++ b/etc-conf/syspurpose/valid_fields.json -@@ -1,12 +1,10 @@ - { - "role": [ -- "Red Hat Enterprise Linux Server", -- "Red Hat Enterprise Linux Workstation", -- "Red Hat Enterprise Linux Compute Node" -+ "CentOS Linux Server", -+ "CentOS Linux Workstation", -+ "CentOS Linux Compute Node" - ], - "service_level_agreement": [ -- "Premium", -- "Standard", - "Self-Support" - ], - "usage": [ diff --git a/SOURCES/subscription-manager-centos-remove-redhat.repo.patch b/SOURCES/subscription-manager-centos-remove-redhat.repo.patch deleted file mode 100644 index 0001d86..0000000 --- a/SOURCES/subscription-manager-centos-remove-redhat.repo.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurp subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py subscription-manager-1.27.11/src/subscription_manager/repofile.py ---- subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py 2020-07-28 11:06:10.000000000 -0500 -+++ subscription-manager-1.27.11/src/subscription_manager/repofile.py 2020-08-05 16:48:00.911709258 -0500 -@@ -368,11 +368,7 @@ class RepoFileBase(object): - Try to create new repo file. - :return: None - """ -- self.create_dir_path() -- if self.path_exists(self.path) or not self.manage_repos: -- return -- with open(self.path, 'w') as f: -- f.write(self.REPOFILE_HEADER) -+ pass - - def fix_content(self, content): - return content diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 9fa1392..62c1979 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.9 +Version: 1.28.10 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -274,9 +274,6 @@ Source2: subscription-manager-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %endif -Patch100: CENTOS-use-centos-syspurposes.patch -Patch101: subscription-manager-centos-remove-redhat.repo.patch - # The following macro examples are preceeded by '%' to stop macro expansion # in the comments. (See https://bugzilla.redhat.com/show_bug.cgi?id=1224660 for # why this is necessary) @@ -321,6 +318,8 @@ 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 @@ -586,11 +585,9 @@ Group: System Environment/Base Requires: rhsm-gtk = %{version}-%{release} Requires: initial-setup-gui >= 0.3.9.24-1 Obsoletes: subscription-manager-firstboot < 1.15.3-1 -%if %{undefined centos} %if (0%{?rhel} >= 8) Supplements: initial-setup-gui %endif -%endif %description -n subscription-manager-initial-setup-addon This package contains the initial-setup screens for subscription-manager. @@ -743,8 +740,6 @@ subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugi %prep %setup -q -%patch100 -p1 -%patch101 -p1 %build make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ @@ -829,9 +824,7 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c # fake out the redhat.repo file %if %{use_yum} || %{use_dnf} mkdir %{buildroot}%{_sysconfdir}/yum.repos.d - %if %{undefined centos} touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo - %endif %endif # fake out the certificate directories @@ -841,19 +834,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/entitlement %if %{use_container_plugin} # Setup cert directories for the container plugin: mkdir -p %{buildroot}%{_sysconfdir}/docker/certs.d/ -%if %{undefined centos} mkdir %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %endif -%endif -%if %{undefined centos} mkdir -p %{buildroot}%{_sysconfdir}/etc/rhsm/ca install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-entitlement-authority.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem install -m 644 %{_builddir}/%{buildsubdir}/etc-conf/redhat-uep.pem %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-uep.pem -%else -rm %{buildroot}/%{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem -%endif %if %use_cockpit # install cockpit dist targz @@ -879,10 +866,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif %endif -%if %{defined centos} -sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf -%endif - # base/cli tools use the gettext domain 'rhsm', while the # gnome-help tools use domain 'subscription-manager' %files -f rhsm.lang @@ -907,6 +890,8 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %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 @@ -1059,6 +1044,8 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %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* @@ -1068,6 +1055,8 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %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__ @@ -1256,12 +1245,10 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %endif %{python_sitearch}/subscription_manager/plugin/container/*.py* -%if %{undefined centos} # Copying Red Hat CA cert into each directory: %attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com %attr(644,root,root) %{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt %endif -%endif %if %has_ostree %files -n subscription-manager-plugin-ostree @@ -1316,10 +1303,8 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %attr(755,root,root) %dir %{_sysconfdir}/rhsm %attr(755,root,root) %dir %{_sysconfdir}/rhsm/ca -%if %{undefined centos} %attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-entitlement-authority.pem %attr(644,root,root) %{_sysconfdir}/rhsm/ca/redhat-uep.pem -%endif %if %use_cockpit %files -n subscription-manager-cockpit @@ -1468,6 +1453,15 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Jan 28 2021 William Poteat 1.28.10-1 +- Use python3-requests and not python-requests. (jhnidek@redhat.com) +- ENT-3289: automatic registration on public cloud (#2407) (jhnidek@redhat.com) +- ENT-3191: Collect metadata of cloud providers (#2381) (jhnidek@redhat.com) +- Detecting of cloud providers; ENT-3288 (#2367) (jhnidek@redhat.com) +- 1899677: Extract of strings for translations (#2399) (wpoteat@redhat.com) +- Syntax update to translation commands (#2395) (wpoteat@redhat.com) +- Update project to use Weblate for translations (#2388) (wpoteat@redhat.com) + * Fri Dec 11 2020 Christopher Snyder 1.28.9-1 - 1904541: Catch ProxyException when checking available orgs (csnyder@redhat.com)