From 642829579dc50040b05d7c713f9bd888ee0e6ca9 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 10 Dec 2020 15:14:15 +0000 Subject: [PATCH] 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 --- .gitignore | 2 ++ sources | 4 ++-- subscription-manager.spec | 19 ++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a7ee10e..b0709d4 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,5 @@ /subscription-manager-cockpit-1.29.0.tar.gz /subscription-manager-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 diff --git a/sources b/sources index 2444834..764528a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.29.1.tar.gz) = 1450066f246abc3aaca4a8f7224573cccb0194b4af36e09c2b213f8e6ca2e773e91d5498984772cd21c28cca0a03674df074bda9ad2ee6a0229f473dc6954e7d -SHA512 (subscription-manager-cockpit-1.29.1.tar.gz) = e740c2576a9f76c8f90fb938087fca9cac5ea6b4131aea9de8bfdb3e03064f98c61ea8132588492919d8911f89e573985c10082556a426d244d5e853b2294023 +SHA512 (subscription-manager-1.29.2.tar.gz) = 572b77e74cff5a637e340d0e20a5488259d2772076e17ccf7b60fa56c9a95f767e103248fdc4e9b588f84aca1486d65108fe85b930093d7958bcc28f445c5519 +SHA512 (subscription-manager-cockpit-1.29.2.tar.gz) = 7ccdb94304b33b88a921c2202ccea7bdda1ec27bf2589f885b827661502778153bd7bce7b116e2186eaf141c01dc8585eb48b153a5988cebb0e211144abf1634 diff --git a/subscription-manager.spec b/subscription-manager.spec index 9e85c9b..84bbb32 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -244,7 +244,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.29.1 +Version: 1.29.2 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -471,18 +471,12 @@ Requires: font(cantarell) Requires: %{?suse_version:dejavu} %{!?suse_version:dejavu-sans-fonts} %endif -%if !0%{?suse_version} -Requires(post): scrollkeeper -Requires(postun): scrollkeeper -%else -%endif %description -n rhsm-gtk This package contains GUI and widgets used by subscription-manager-gui and RHSM initial_setup module for Anaconda. %endif - %if %{use_subman_gui} %package -n subscription-manager-gui 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 Provides: %{name}-gnome = %{version}-%{release} +%if !0%{?suse_version} +Requires(post): scrollkeeper +Requires(postun): scrollkeeper +%else +%endif + %description -n subscription-manager-gui This package contains a GTK+ graphical interface for configuring and 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 %changelog +* Thu Dec 10 2020 Christopher Snyder 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 1.29.1-1 - 1894450: Fix issue with identity command; ENT-3235 (#2362) (jhnidek@redhat.com)