Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/subscription-manager.git#e30fe9821182fd43bb179080ff7ccfbe4ec50c3c
This commit is contained in:
DistroBaker 2020-12-10 15:14:15 +00:00
parent e2615e63d8
commit 642829579d
3 changed files with 16 additions and 9 deletions

2
.gitignore vendored
View File

@ -113,3 +113,5 @@
/subscription-manager-cockpit-1.29.0.tar.gz /subscription-manager-cockpit-1.29.0.tar.gz
/subscription-manager-1.29.1.tar.gz /subscription-manager-1.29.1.tar.gz
/subscription-manager-cockpit-1.29.1.tar.gz /subscription-manager-cockpit-1.29.1.tar.gz
/subscription-manager-1.29.2.tar.gz
/subscription-manager-cockpit-1.29.2.tar.gz

View File

@ -1,2 +1,2 @@
SHA512 (subscription-manager-1.29.1.tar.gz) = 1450066f246abc3aaca4a8f7224573cccb0194b4af36e09c2b213f8e6ca2e773e91d5498984772cd21c28cca0a03674df074bda9ad2ee6a0229f473dc6954e7d SHA512 (subscription-manager-1.29.2.tar.gz) = 572b77e74cff5a637e340d0e20a5488259d2772076e17ccf7b60fa56c9a95f767e103248fdc4e9b588f84aca1486d65108fe85b930093d7958bcc28f445c5519
SHA512 (subscription-manager-cockpit-1.29.1.tar.gz) = e740c2576a9f76c8f90fb938087fca9cac5ea6b4131aea9de8bfdb3e03064f98c61ea8132588492919d8911f89e573985c10082556a426d244d5e853b2294023 SHA512 (subscription-manager-cockpit-1.29.2.tar.gz) = 7ccdb94304b33b88a921c2202ccea7bdda1ec27bf2589f885b827661502778153bd7bce7b116e2186eaf141c01dc8585eb48b153a5988cebb0e211144abf1634

View File

@ -244,7 +244,7 @@
%global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
Name: subscription-manager Name: subscription-manager
Version: 1.29.1 Version: 1.29.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: Tools and libraries for subscription and repository management Summary: Tools and libraries for subscription and repository management
%if 0%{?suse_version} %if 0%{?suse_version}
@ -471,18 +471,12 @@ Requires: font(cantarell)
Requires: %{?suse_version:dejavu} %{!?suse_version:dejavu-sans-fonts} Requires: %{?suse_version:dejavu} %{!?suse_version:dejavu-sans-fonts}
%endif %endif
%if !0%{?suse_version}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
%else
%endif
%description -n rhsm-gtk %description -n rhsm-gtk
This package contains GUI and widgets used by subscription-manager-gui This package contains GUI and widgets used by subscription-manager-gui
and RHSM initial_setup module for Anaconda. and RHSM initial_setup module for Anaconda.
%endif %endif
%if %{use_subman_gui} %if %{use_subman_gui}
%package -n subscription-manager-gui %package -n subscription-manager-gui
Summary: A GUI interface to manage Red Hat product subscriptions Summary: A GUI interface to manage Red Hat product subscriptions
@ -501,6 +495,12 @@ Requires: rhsm-gtk = %{version}-%{release}
Obsoletes: %{name}-gnome < 1.0.3-1 Obsoletes: %{name}-gnome < 1.0.3-1
Provides: %{name}-gnome = %{version}-%{release} Provides: %{name}-gnome = %{version}-%{release}
%if !0%{?suse_version}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
%else
%endif
%description -n subscription-manager-gui %description -n subscription-manager-gui
This package contains a GTK+ graphical interface for configuring and This package contains a GTK+ graphical interface for configuring and
registering a system with a Red Hat Entitlement platform and manage registering a system with a Red Hat Entitlement platform and manage
@ -1499,6 +1499,11 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
%endif %endif
%changelog %changelog
* Thu Dec 10 2020 Christopher Snyder <csnyder@redhat.com> 1.29.2-1
- 1801570: drop scrollkeeper/rarian as a dependency from rhsm-gtk
(csnyder@redhat.com)
- Stop releasing to f31 (f31 is no longer supported) (csnyder@redhat.com)
* Thu Dec 03 2020 Christopher Snyder <csnyder@redhat.com> 1.29.1-1 * Thu Dec 03 2020 Christopher Snyder <csnyder@redhat.com> 1.29.1-1
- 1894450: Fix issue with identity command; ENT-3235 (#2362) - 1894450: Fix issue with identity command; ENT-3235 (#2362)
(jhnidek@redhat.com) (jhnidek@redhat.com)