Update subscription-manager to 1.28.5-1
Resolves: #1886745 - Fix __init__ of CPProvider; ENT-3147 (jhnidek@redhat.com) Resolves: #1833316 - unset-addons argument is missing in the bash completion of Resolves: #1875595 - Service-Level set issues (wpoteat@redhat.com)
This commit is contained in:
Christopher Snyder
parent
6aa4c67399
commit
d6013c2d97
2
.gitignore
vendored
2
.gitignore
vendored
@ -105,3 +105,5 @@
|
||||
/subscription-manager-cockpit-1.28.2.tar.gz
|
||||
/subscription-manager-1.28.4.tar.gz
|
||||
/subscription-manager-cockpit-1.28.4.tar.gz
|
||||
/subscription-manager-1.28.5.tar.gz
|
||||
/subscription-manager-cockpit-1.28.5.tar.gz
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (subscription-manager-1.28.4.tar.gz) = cb0f8f4832cf1cf316818a77a4e7521aa0cc21fe4456018f2f6568200c6d952460f1f6927d57ede2eed09f66c6f352b4022330f02ad7bf43cc9f509f39d9fc15
|
||||
SHA512 (subscription-manager-cockpit-1.28.4.tar.gz) = 0662455af17c187d848481f70f53726df624db603338afa95b8f5bf2f629618a98bfe51593eb44c0994b6928ca488ba0c08cbe732bba2d8f4fa0087779fe7028
|
||||
SHA512 (subscription-manager-1.28.5.tar.gz) = 98bfbed48749b7a20ec8e6567fb51650040a9a3eeceb9764af1a0c0a0e9100197debf07b94a24b10aad4fa932cdc2cf284bb69017f02ce89fa8acaf76fc3c212
|
||||
SHA512 (subscription-manager-cockpit-1.28.5.tar.gz) = 751a9c18634f6e1b0f1f2a596a0fc8c3b9fa0c98143d845b6203fef70e63fd1c2adca9b08276185d1375d5b2cda6f642097b3c659854d5f89bf9cc393fed39f8
|
||||
|
||||
@ -100,7 +100,6 @@
|
||||
%endif
|
||||
|
||||
%global use_dnf (%{with python3} && (0%{?fedora} || (0%{?rhel}))) || (0%{?rhel} >= 7)
|
||||
%global use_libdnf (0%{?fedora} >= 29 || 0%{?rhel} >= 8)
|
||||
%global use_yum (0%{?rhel} && 0%{?rhel} <= 7)
|
||||
%global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7
|
||||
|
||||
@ -244,7 +243,7 @@
|
||||
%global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
|
||||
|
||||
Name: subscription-manager
|
||||
Version: 1.28.4
|
||||
Version: 1.28.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Tools and libraries for subscription and repository management
|
||||
%if 0%{?suse_version}
|
||||
@ -323,10 +322,8 @@ Requires: %{?suse_version:dbus-1-python} %{!?suse_version:dbus-python}
|
||||
Requires: %{?suse_version:yum} %{!?suse_version:yum >= 3.2.29-73}
|
||||
%endif
|
||||
|
||||
%if %{use_dnf}
|
||||
Requires: dnf >= 1.0.0
|
||||
Requires: python3-dnf-plugins-core
|
||||
Requires: python3-librepo
|
||||
%if (%{use_dnf} && (0%{?fedora} || 0%{?rhel} >= 8))
|
||||
Requires: dnf-plugin-subscription-manager = %{version}
|
||||
%endif
|
||||
|
||||
# Support GTK2 and GTK3 on both SUSE and RHEL...
|
||||
@ -402,15 +399,6 @@ BuildRequires: systemd
|
||||
Obsoletes: subscription-manager-plugin-container
|
||||
%endif
|
||||
|
||||
%if %{use_dnf}
|
||||
# The libdnf plugin is in separate RPM, but shubscription-manager should be dependent
|
||||
# on this RPM, because somebody can install microdnf on host and installing of product
|
||||
# certs would not work as expected without libdnf plugin
|
||||
Requires: libdnf-plugin-subscription-manager = %{version}
|
||||
# The dnf plugin is now part of subscription-manager
|
||||
Obsoletes: dnf-plugin-subscription-manager
|
||||
%endif
|
||||
|
||||
%description
|
||||
The Subscription Manager package provides programs and libraries to allow users
|
||||
to manage subscriptions and yum repositories from the Red Hat entitlement
|
||||
@ -526,25 +514,43 @@ subscriptions
|
||||
%endif
|
||||
|
||||
|
||||
%if %{use_libdnf}
|
||||
%package -n libdnf-plugin-subscription-manager
|
||||
Summary: Subscription Manager plugin for libdnf
|
||||
%if %use_dnf
|
||||
%package -n dnf-plugin-subscription-manager
|
||||
Summary: Subscription Manager plugins for DNF
|
||||
%if 0%{?suse_version}
|
||||
Group: Productivity/Networking/System
|
||||
%else
|
||||
Group: System Environment/Base
|
||||
%endif
|
||||
%if (0%{?fedora} >= 29 || 0%{?rhel} >= 8)
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: libdnf-devel >= 0.22.5
|
||||
Requires: json-c
|
||||
Requires: libdnf >= 0.22.5
|
||||
%endif
|
||||
# See BZ 1581410 - avoid a circular dependency
|
||||
%if (0%{?rhel} < 8)
|
||||
Requires: %{name} >= %{version}-%{release}
|
||||
%endif
|
||||
%if %{with python3}
|
||||
Requires: python3-dnf-plugins-core
|
||||
Requires: python3-librepo
|
||||
%else
|
||||
Requires: python2-dnf-plugins-core
|
||||
%if (0%{?rhel} == 7)
|
||||
Requires: python-librepo
|
||||
%else
|
||||
Requires: python2-librepo
|
||||
%endif
|
||||
%endif
|
||||
Requires: dnf >= 1.0.0
|
||||
|
||||
%description -n libdnf-plugin-subscription-manager
|
||||
This package provides a plugin to interact with repositories from the Red Hat
|
||||
entitlement platform; contains only one product-id binary plugin used by
|
||||
e.g. microdnf.
|
||||
%description -n dnf-plugin-subscription-manager
|
||||
This package provides plugins to interact with repositories and subscriptions
|
||||
from the Red Hat entitlement platform; contains subscription-manager and
|
||||
product-id plugins.
|
||||
%endif
|
||||
|
||||
|
||||
@ -744,7 +750,7 @@ make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
|
||||
python2 ./setup.py build --quiet --gtk-version=%{?gtk3:3}%{?!gtk3:2} --rpm-version=%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if %{use_libdnf}
|
||||
%if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8))
|
||||
pushd src/dnf-plugins/product-id
|
||||
%cmake -DCMAKE_BUILD_TYPE="Release"
|
||||
%if (0%{?rhel} && 0%{?rhel} <= 8)
|
||||
@ -773,7 +779,7 @@ make -f Makefile install VERSION=%{version}-%{release} \
|
||||
%{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \
|
||||
%{?exclude_packages}
|
||||
|
||||
%if %{use_libdnf}
|
||||
%if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8))
|
||||
pushd src/dnf-plugins/product-id
|
||||
mkdir -p %{buildroot}%{_libdir}/libdnf/plugins
|
||||
%if (0%{?rhel} && 0%{?rhel} <= 8)
|
||||
@ -1026,10 +1032,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%{_prefix}/lib/yum-plugins/search-disabled-repos.py*
|
||||
%endif
|
||||
|
||||
%if %{use_dnf}
|
||||
%{python_sitelib}/dnf-plugins/*
|
||||
%endif
|
||||
|
||||
# zypper plugins
|
||||
%if 0%{?suse_version}
|
||||
%{_prefix}/lib/zypp/plugins/services/rhsm
|
||||
@ -1268,11 +1270,14 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%endif
|
||||
|
||||
|
||||
%if %{use_libdnf}
|
||||
%files -n libdnf-plugin-subscription-manager
|
||||
%if %use_dnf
|
||||
%files -n dnf-plugin-subscription-manager
|
||||
%defattr(-,root,root,-)
|
||||
%{python_sitelib}/dnf-plugins/*
|
||||
%if (0%{?fedora} >= 29 || 0%{?rhel} >= 8)
|
||||
%{_libdir}/libdnf/plugins/product-id.so
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%files -n %{rhsm_package_name}
|
||||
@ -1441,6 +1446,15 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Oct 22 2020 Christopher Snyder <csnyder@redhat.com> 1.28.5-1
|
||||
- removing yarn (jmolet@redhat.com)
|
||||
- Revert "1847910: DNF plugins are part of sub-man RPM, libdnf RPM; ENT-2536"
|
||||
(csnyder@redhat.com)
|
||||
- 1886745: Fix __init__ of CPProvider; ENT-3147 (jhnidek@redhat.com)
|
||||
- 1833316: unset-addons argument is missing in the bash completion of
|
||||
syspurpose (wpoteat@redhat.com)
|
||||
- 1875595: Service-Level set issues (wpoteat@redhat.com)
|
||||
|
||||
* Wed Oct 07 2020 Christopher Snyder <csnyder@redhat.com> 1.28.4-1
|
||||
- Revert the --no-insights feature (csnyder@redhat.com)
|
||||
- adding Jenkinsfile and CI test scripts (jmolet@redhat.com)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user