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#75a34d9d2e36640c28884ad1c1d57f7112ba4581
This commit is contained in:
DistroBaker 2020-12-10 19:14:32 +00:00
parent 642829579d
commit 3d52c8b159
3 changed files with 9 additions and 4 deletions

2
.gitignore vendored
View File

@ -115,3 +115,5 @@
/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-1.29.2.tar.gz
/subscription-manager-cockpit-1.29.2.tar.gz /subscription-manager-cockpit-1.29.2.tar.gz
/subscription-manager-1.29.3.tar.gz
/subscription-manager-cockpit-1.29.3.tar.gz

View File

@ -1,2 +1,2 @@
SHA512 (subscription-manager-1.29.2.tar.gz) = 572b77e74cff5a637e340d0e20a5488259d2772076e17ccf7b60fa56c9a95f767e103248fdc4e9b588f84aca1486d65108fe85b930093d7958bcc28f445c5519 SHA512 (subscription-manager-1.29.3.tar.gz) = adccf930c02e26fe32ec0cdc7248087f6a1c44b8a8398a78ef916452a96cc2c0327c7d07f141d3d6346cf7309558731b68cdcd13a9d64fb6660deda7dd610810
SHA512 (subscription-manager-cockpit-1.29.2.tar.gz) = 7ccdb94304b33b88a921c2202ccea7bdda1ec27bf2589f885b827661502778153bd7bce7b116e2186eaf141c01dc8585eb48b153a5988cebb0e211144abf1634 SHA512 (subscription-manager-cockpit-1.29.3.tar.gz) = cce9a752ace9e238b3bb7880cbb406c647c6058298d8ac4b5d193bd0f9ff60846a2399b29c153be9c2e541aec2c36711e2ee6a197c0abf68e8bcac51c934c6e7

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.2 Version: 1.29.3
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}
@ -1321,7 +1321,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%if %{create_libdnf_rpm} %if %{create_libdnf_rpm}
%files -n libdnf-plugin-subscription-manager %files -n libdnf-plugin-subscription-manager
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{python_sitelib}/dnf-plugins/*
%{_libdir}/libdnf/plugins/product-id.so %{_libdir}/libdnf/plugins/product-id.so
%else %else
# DNF RPM # DNF RPM
@ -1499,6 +1498,10 @@ 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.3-1
- 1847910: Do not include dnf plugins in libdnf RPM. (#2370)
(jhnidek@redhat.com)
* Thu Dec 10 2020 Christopher Snyder <csnyder@redhat.com> 1.29.2-1 * Thu Dec 10 2020 Christopher Snyder <csnyder@redhat.com> 1.29.2-1
- 1801570: drop scrollkeeper/rarian as a dependency from rhsm-gtk - 1801570: drop scrollkeeper/rarian as a dependency from rhsm-gtk
(csnyder@redhat.com) (csnyder@redhat.com)