diff --git a/.gitignore b/.gitignore index 8a6507e..1fc0334 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.28.13.tar.gz -SOURCES/subscription-manager-cockpit-1.28.13.tar.gz +SOURCES/subscription-manager-1.28.16.tar.gz +SOURCES/subscription-manager-cockpit-1.28.16.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index 15b5eb9..4a2b70e 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -5db5807dec6579b0fcbd2a9b1e693a23ff23b02c SOURCES/subscription-manager-1.28.13.tar.gz -76bd7e5b39c67c76c1b52e8d20ee84497b0a7707 SOURCES/subscription-manager-cockpit-1.28.13.tar.gz +03e021d57bb8bc2cf305f4dfc4165a41a4baeda8 SOURCES/subscription-manager-1.28.16.tar.gz +6e3acabd98661be3ad590c116ed0c5aacfc81686 SOURCES/subscription-manager-cockpit-1.28.16.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 6acbb14..9f00dd5 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -243,8 +243,8 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.28.13 -Release: 2%{?dist} +Version: 1.28.16 +Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} Group: Productivity/Networking/System @@ -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) @@ -588,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. @@ -745,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}" \ @@ -831,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 @@ -843,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 @@ -881,33 +866,38 @@ 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 %defattr(-,root,root,-) + +# Make some unusual directories for suse part of subscription-manager %if 0%{?suse_version} %dir %{_sysconfdir}/pki +%dir %{_prefix}/share/polkit-1 +%dir %{_prefix}/share/polkit-1/actions +# Suse specific %if %{use_yum} %dir %{_sysconfdir}/yum %dir %{_sysconfdir}/yum/pluginconf.d %dir %{_prefix}/lib/yum-plugins/ %endif +# Suse specific %if %{use_dnf} %dir %{_sysconfdir}/dnf %dir %{_sysconfdir}/dnf/plugins %dir %{_prefix}/lib/dnf-plugins/ %endif +# Suse specific %if %{use_yum} || %{use_dnf} %dir %{_sysconfdir}/yum.repos.d %endif +%endif + %dir %{python_sitearch}/rhsmlib/candlepin %dir %{python_sitearch}/rhsmlib/cloud %dir %{python_sitearch}/rhsmlib/cloud/providers @@ -924,9 +914,7 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %dir %{python_sitearch}/subscription_manager/plugin %dir %{python_sitearch}/subscription_manager/scripts %dir %{_var}/spool/rhsm -%dir %{_prefix}/share/polkit-1 -%dir %{_prefix}/share/polkit-1/actions -%endif + %if 0%{?suse_version} && 0%{?suse_version} < 1315 %dir %{_prefix}/share/locale/ta_IN %dir %{_prefix}/share/locale/ta_IN/LC_MESSAGES @@ -1264,12 +1252,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 @@ -1324,10 +1310,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 @@ -1352,9 +1336,14 @@ sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscripti %{_datadir}/icons/hicolor/symbolic/apps/*.svg %endif +%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} -%pre %service_add_pre rhsm.service %service_add_pre rhsm-facts.service %service_add_pre rhsmcertd.service @@ -1476,8 +1465,110 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog -* Mon Mar 15 2021 Christopher Snyder 1.28.13-2 +* Mon Apr 26 2021 Christopher Snyder 1.28.16-1 +- 1950015: fix typos in syspurpose(8) (#2604) (ptoscano@redhat.com) +- Updated translations for Korean and Italian from weblate (simmon@nplob.com) +- 1916540: Negative proxy tests occasionally encounter the wrong exception + handling (tmerry@redhat.com) +- 1880920: check for invalid addons (ptoscano@redhat.com) +- 1637083: Removed the parameters to the unset-addons subcommand + (tmerry@redhat.com) +- 1898552: refactor/fix collection of IP v4/v6 address info + (ptoscano@redhat.com) +- 1636950: modify description in the man page for syspurpose for the generic + commands (tmerry@redhat.com) +- cockpit: Enable TLS for mock insights server (martin@piware.de) +- cockpit: Update test API to 236 (martin@piware.de) +- cockpit: Replace obsolete wait_present() with wait_visible() + (martin@piware.de) +- cockpit: Adjust for changed services image (martin@piware.de) +- 1928072: Print warning message and don't do auto-attach (jhnidek@redhat.com) +- 1878133: Deprecation message for syspurpose (#2421) (wpoteat@redhat.com) +- 1819555: cockpit: translate untranslatable messages (ptoscano@redhat.com) +- cockpit: fix extraction of plural messages (ptoscano@redhat.com) +- 1863039: Fix issue with dnf/yum variables (jhnidek@redhat.com) +- 1878736: use our i18n functions instead of dnf ones (ptoscano@redhat.com) +- Switch dates returned by D-Bus ListInstalledProducts to ISO 8601 + (ptoscano@redhat.com) +- 1793501: switch dates returned by D-Bus GetPool to ISO 8601 + (ptoscano@redhat.com) +- ENT-2779: call format() on translated string (ptoscano@redhat.com) +- 1930037: cockpit: ensure /etc/pki/product exist (ptoscano@redhat.com) +- 1749395: Proper handling when a user does not have an org + (wpoteat@redhat.com) +- Add RHEL 8.5 releaser (csnyder@redhat.com) + +* Tue Mar 30 2021 Christopher Snyder 1.28.15-1 +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1636950: make value possibly plural for addons in syspurpose man page + (tmerry@localhost.localdomain) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Italian) (toscano.pino@tiscali.it) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Italian) (toscano.pino@tiscali.it) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- update language of REPOS OPTIONS in subscription-manager man page + (tmerry@localhost.localdomain) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- change add-ons to addons (tmerry@localhost.localdomain) +- 1634780: typo in syspurpose man page (tmerry@localhost.localdomain) +- 1856832: add --org=ORG to the ROLE OPTIONS, USAGE OPTIONS and ADDONS OPTIONS + of the subscription-manager man pages (tmerry@localhost.localdomain) +- 1637083: add unset sections (tmerry@localhost.localdomain) +- 1920017: Remove a sentence from the subscription-manager man page. + (tmerry@localhost.localdomain) +- 1646718: Debrand message to not include Red Hat Subscription Manager but + instead with an entitlement server (tmerry@localhost.localdomain) +- 1682943: put a blank space back into a comment to separate two sentences + (tmerry@localhost.localdomain) +- 1857491: Add newline character to split a message into 2 lines + (tmerry@localhost.localdomain) +- 1920020: Set default_log_level to INFO when an invalid value is passed on the + command line (#2481) (31166354+tlhmerry9@users.noreply.github.com) +- 1924921: Fix getting releases, when SCA is used (jhnidek@redhat.com) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Added translation using Weblate (Sinhala) (r45xveza@pm.me) +- 1944093: Added translation using Weblate (Sinhala) (r45xveza@pm.me) +- 1927245: Mark several dir as part of RPM (jhnidek@redhat.com) + +* Tue Mar 30 2021 Christopher Snyder +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1636950: make value possibly plural for addons in syspurpose man page + (tmerry@localhost.localdomain) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Italian) (toscano.pino@tiscali.it) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Italian) (toscano.pino@tiscali.it) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- update language of REPOS OPTIONS in subscription-manager man page + (tmerry@localhost.localdomain) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- change add-ons to addons (tmerry@localhost.localdomain) +- 1634780: typo in syspurpose man page (tmerry@localhost.localdomain) +- 1856832: add --org=ORG to the ROLE OPTIONS, USAGE OPTIONS and ADDONS OPTIONS + of the subscription-manager man pages (tmerry@localhost.localdomain) +- 1637083: add unset sections (tmerry@localhost.localdomain) +- 1920017: Remove a sentence from the subscription-manager man page. + (tmerry@localhost.localdomain) +- 1646718: Debrand message to not include Red Hat Subscription Manager but + instead with an entitlement server (tmerry@localhost.localdomain) +- 1682943: put a blank space back into a comment to separate two sentences + (tmerry@localhost.localdomain) +- 1857491: Add newline character to split a message into 2 lines + (tmerry@localhost.localdomain) +- 1920020: Set default_log_level to INFO when an invalid value is passed on the + command line (#2481) (31166354+tlhmerry9@users.noreply.github.com) - 1924921: Fix getting releases, when SCA is used (jhnidek@redhat.com) +- 1944093: Translated using Weblate (Korean) (simmon@nplob.com) +- 1944093: Added translation using Weblate (Sinhala) (r45xveza@pm.me) +- 1944093: Added translation using Weblate (Sinhala) (r45xveza@pm.me) +- 1927245: Mark several dir as part of RPM (jhnidek@redhat.com) * Thu Feb 18 2021 Christopher Snyder 1.28.13-1 - Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com)