From 69c3136274fdb0aa27657aa50a863de6f9ea7e29 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 20 2020 10:51:48 +0000 Subject: import subscription-manager-1.24.34-1.el7 --- diff --git a/.gitignore b/.gitignore index 6b71812..a8a9b8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/subscription-manager-1.24.21.tar.gz -SOURCES/subscription-manager-cockpit-1.24.21.tar.gz +SOURCES/subscription-manager-1.24.34.tar.gz +SOURCES/subscription-manager-cockpit-1.24.34.tar.gz diff --git a/.subscription-manager.metadata b/.subscription-manager.metadata index d61e3e5..a2be163 100644 --- a/.subscription-manager.metadata +++ b/.subscription-manager.metadata @@ -1,2 +1,2 @@ -317e3f97d9a20aa37de21f1be99f6b5f8548b7fa SOURCES/subscription-manager-1.24.21.tar.gz -de9ddee5f36e7e66624172f9b6ae706d51be0e82 SOURCES/subscription-manager-cockpit-1.24.21.tar.gz +5eba1b93aaafb0090f23b2205c1d117d6fe007da SOURCES/subscription-manager-1.24.34.tar.gz +5da93c4f2f452d60990073a7e312c2aff7ebad8b SOURCES/subscription-manager-cockpit-1.24.34.tar.gz diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SPECS/subscription-manager.spec b/SPECS/subscription-manager.spec index 40034a2..131dfd6 100644 --- a/SPECS/subscription-manager.spec +++ b/SPECS/subscription-manager.spec @@ -132,7 +132,7 @@ %global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}" Name: subscription-manager -Version: 1.24.21 +Version: 1.24.34 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management Group: System Environment/Base @@ -579,14 +579,18 @@ cp %{buildroot}%{python_sitearch}/rhsm/*.py %{buildroot}%{python2_sitearch}/rhsm desktop-file-validate %{buildroot}/etc/xdg/autostart/rhsm-icon.desktop desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-gui.desktop %else + %if %use_cockpit desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-cockpit.desktop %endif + %endif # libexec directory does not exist on sles based distros %if 0%{?suse_version} -sed -i 's/libexec/lib/g' %{buildroot}/%{_sysconfdir}/cron.daily/rhsmd +%if %use_subman_gui + sed -i 's/libexec/lib/g' %{buildroot}/%{_sysconfdir}/cron.daily/rhsmd +%endif %endif %find_lang rhsm @@ -679,7 +683,10 @@ find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; %attr(755,root,root) %{_bindir}/rhsmcertd %attr(755,root,root) %{_libexecdir}/rhsmcertd-worker -%attr(755,root,root) %{_libexecdir}/rhsmd + +%if %{use_subman_gui} + %attr(755,root,root) %{_libexecdir}/rhsmd +%endif # our config dirs and files @@ -721,7 +728,9 @@ find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; # misc system config %config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/subscription-manager -%attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd +%if %{use_subman_gui} + %attr(700,root,root) %{_sysconfdir}/cron.daily/rhsmd +%endif %attr(755,root,root) %dir %{_var}/log/rhsm %attr(755,root,root) %dir %{_var}/spool/rhsm/debug @@ -896,6 +905,7 @@ find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; # symlink to console-helper %{_bindir}/subscription-manager-gui %endif + %{_bindir}/rhsm-icon %{_datadir}/gnome/help/subscription-manager/C/figures/*.png @@ -1058,11 +1068,12 @@ find %{buildroot} -name \*.py -exec touch -r %{SOURCE0} '{}' \; %{_datadir}/cockpit/subscription-manager/index.html %{_datadir}/cockpit/subscription-manager/index.min.js.gz %{_datadir}/cockpit/subscription-manager/subscriptions.css +%{_datadir}/cockpit/subscription-manager/index.css %{_datadir}/cockpit/subscription-manager/manifest.json %{_datadir}/cockpit/subscription-manager/po.*.js %{_datadir}/cockpit/subscription-manager/po.js %{_datadir}/cockpit/subscription-manager/node_modules/* -%{_datadir}/metainfo/org.cockpit-project.subscription-manager.metainfo.xml +%{_datadir}/metainfo/org.candlepinproject.subscription_manager.metainfo.xml %if ! %use_subman_gui %{_datadir}/applications/subscription-manager-cockpit.desktop %{_datadir}/icons/hicolor/16x16/apps/*.png @@ -1150,6 +1161,91 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Apr 17 2020 William Poteat 1.24.34-1 +- 1796986: Collect AWS instance id when available (wpoteat@redhat.com) + +* Thu Apr 16 2020 William Poteat 1.24.33-1 +- 1796833: RHEL 7.9 Tier 0 Localization (wpoteat@redhat.com) +- 1818932: Using 'Simple Content Access' for access mode + (wpoteat@redhat.com) + +* Wed Apr 08 2020 William Poteat 1.24.32-1 +- 1821830: Registration fails with a message "Restlib' object has no attribute + '_get_cert_key_list' (wpoteat@redhat.com) + +* Mon Apr 06 2020 William Poteat 1.24.31-1 +- Flags for build [relro] (wpoteat@redhat.com) + +* Mon Apr 06 2020 William Poteat 1.24.30-1 +- 1816926: Fix "attach --auto" command; ENT-2242 (jhnidek@redhat.com) +- 1775714: Do not install rhsmd and rhsm-icon on rhel8; ENT-1959 + (jhnidek@redhat.com) +- 1763271: Golden ticket: do not print list of products; ENT-2017 + (jhnidek@redhat.com) + +* Thu Mar 26 2020 Christopher Snyder 1.24.29-1 +- 1569491: rhn-migrate-classic-to-rhsm should try to resolve product ID + collisions (wpoteat@redhat.com) +- 1688702: allow offline repo management (code@james.cassell.me) + +* Fri Mar 20 2020 William Poteat 1.24.28-1 +- 1794653: corrected missing quotes for config check; ENT-2010 + (crag@redhat.com) +- Update to releasers (wpoteat@redhat.com) +- 1803783: Added copytruncate option to logrotate conf file; ENT-2114 + (jhnidek@redhat.com) + +* Wed Feb 26 2020 William Poteat 1.24.27-1 +- 1796088: Added option --force for command refresh; ENT-2033 + (jhnidek@redhat.com) +- Update releasers for new release (wpoteat@redhat.com) +- 1702753: Fix cockpit plugin, when golden ticket is used; ENT-1287 + (jhnidek@redhat.com) +- Bump sshpk from 1.13.1 to 1.16.1 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- Bump eslint from 3.19.0 to 4.18.2 in /cockpit + (49699333+dependabot[bot]@users.noreply.github.com) +- Bump stringstream from 0.0.5 to 0.0.6 in /cockpit + (49699333+dependabot[bot]@users.noreply.github.com) +- Bump macaddress from 0.2.8 to 0.2.9 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- Bump is-my-json-valid from 2.16.0 to 2.20.0 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- 1719709: cockpit - Improve behavior when connection to D-Bus fails + (mvollmer@redhat.com) +- 1719702: cockpit - Fix overlapping update requests (mvollmer@redhat.com) +- 1719697: cockpit - Fix detection of proxy while attaching + (mvollmer@redhat.com) +- Bump sshpk from 1.13.1 to 1.16.1 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- Bump tar from 2.2.1 to 2.2.2 in /cockpit + (dependabot[bot]@users.noreply.github.com) +- cockpit plugin: Fix alignment and layout issues in register dialog + (anilsson@redhat.com) +- Fix subscription-manager-cockpit AppStream data (martin@piware.de) + +* Wed Jan 22 2020 William Poteat 1.24.26-1 +- 1741183: Yum loaded subscription-manager plugin multiple times + (hyu@redhat.com) + +* Wed Jan 08 2020 Christopher Snyder 1.24.25-1 +- 1786236: Update repos quickly enough to allow yum install -y $package + immediately in containers (csnyder@redhat.com) +- 1788293: Update repos in postconfig_hook to see new repos immediately + (csnyder@redhat.com) +- 1788297: Duplicate messages are being reported by the yum plugin for + subscription-manager (wpoteat@redhat.com) + +* Mon Jan 06 2020 William Poteat 1.24.24-1 +- 1733992: Update to translations (wpoteat@redhat.com) + +* Thu Oct 17 2019 Christopher Snyder 1.24.23-1 +- 1703054: Blacklist some locales for Python2.x; ENT-1288 (jhnidek@redhat.com) + +* Tue Oct 08 2019 Christopher Snyder 1.24.22-1 +- 1756491: Remove usage of deprecated method in yum plugins + (csnyder@redhat.com) + * Thu Sep 19 2019 Christopher Snyder 1.24.21-1 - 1724712: Updated from System Type to Entitlement Type (waldirio@gmail.com)