From 6aa4c673993c2328b671514d859aaa87df3c172c Mon Sep 17 00:00:00 2001 From: Christopher Snyder Date: Wed, 7 Oct 2020 15:26:48 -0400 Subject: [PATCH] Update subscription-manager to 1.28.4-1 Resolves: #1847910 - DNF plugins are part of sub-man RPM, libdnf RPM Resolves: #1826300 - Ignore auto-attach, when SCA mode is used Resolves: #1862431 - option validation error from unexpected config entry Resolves: #1844508 - sub-man sends version in the User-Agent header Resolves: #1855437 - syspurpose CLI should require sub-man rpm Resolves: #1870567 - Fix issue with locale and D-Bus method GetStatus Resolves: #1868734 - Fix issue with syspurpose attrs. set in act. key Resolves: #1753236 - D-Bus Register properly, when org not specified --- .gitignore | 2 + sources | 4 +- subscription-manager.spec | 92 ++++++++++++++++++++++++--------------- 3 files changed, 61 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index bbfbc99..a3de3ff 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,5 @@ /subscription-manager-cockpit-1.27.1.tar.gz /subscription-manager-1.28.2.tar.gz /subscription-manager-cockpit-1.28.2.tar.gz +/subscription-manager-1.28.4.tar.gz +/subscription-manager-cockpit-1.28.4.tar.gz diff --git a/sources b/sources index 775abde..ed353a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (subscription-manager-1.28.2.tar.gz) = b1304b81420252d9eb73b3d3dae4b8b459c4b466ac7133923decd291236e031daa342a01399444656df56b9bcf763ecba41f80267a2b131d15c4da4ad14a3df2 -SHA512 (subscription-manager-cockpit-1.28.2.tar.gz) = 164e7af8451a036f9ad6cbf0bf930658fa7019f677aaab6e13a8c66fa4644419d47cbe1f1b0d927702188ac0afd2ddf7a7d991750315169670a31e460023b933 +SHA512 (subscription-manager-1.28.4.tar.gz) = cb0f8f4832cf1cf316818a77a4e7521aa0cc21fe4456018f2f6568200c6d952460f1f6927d57ede2eed09f66c6f352b4022330f02ad7bf43cc9f509f39d9fc15 +SHA512 (subscription-manager-cockpit-1.28.4.tar.gz) = 0662455af17c187d848481f70f53726df624db603338afa95b8f5bf2f629618a98bfe51593eb44c0994b6928ca488ba0c08cbe732bba2d8f4fa0087779fe7028 diff --git a/subscription-manager.spec b/subscription-manager.spec index 72a19eb..dc9c61e 100644 --- a/subscription-manager.spec +++ b/subscription-manager.spec @@ -100,6 +100,7 @@ %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 @@ -243,7 +244,7 @@ %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk} Name: subscription-manager -Version: 1.28.2 +Version: 1.28.4 Release: 1%{?dist} Summary: Tools and libraries for subscription and repository management %if 0%{?suse_version} @@ -322,8 +323,10 @@ 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} && (0%{?fedora} || 0%{?rhel} >= 8)) -Requires: dnf-plugin-subscription-manager = %{version} +%if %{use_dnf} +Requires: dnf >= 1.0.0 +Requires: python3-dnf-plugins-core +Requires: python3-librepo %endif # Support GTK2 and GTK3 on both SUSE and RHEL... @@ -399,6 +402,15 @@ 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 @@ -412,6 +424,7 @@ Group: Productivity/Networking/System %else Group: System Environment/Base %endif +Requires: %{name} = %{version}-%{release} %description -n %{py_package_prefix}-syspurpose Provides the syspurpose commandline utility. This utility manages the system syspurpose. @@ -513,43 +526,25 @@ subscriptions %endif -%if %use_dnf -%package -n dnf-plugin-subscription-manager -Summary: Subscription Manager plugins for DNF +%if %{use_libdnf} +%package -n libdnf-plugin-subscription-manager +Summary: Subscription Manager plugin for libdnf %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 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. +%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. %endif @@ -749,7 +744,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_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8)) +%if %{use_libdnf} pushd src/dnf-plugins/product-id %cmake -DCMAKE_BUILD_TYPE="Release" %if (0%{?rhel} && 0%{?rhel} <= 8) @@ -778,7 +773,7 @@ make -f Makefile install VERSION=%{version}-%{release} \ %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \ %{?exclude_packages} -%if (%{use_dnf} && (0%{?fedora} >= 29 || 0%{?rhel} >= 8)) +%if %{use_libdnf} pushd src/dnf-plugins/product-id mkdir -p %{buildroot}%{_libdir}/libdnf/plugins %if (0%{?rhel} && 0%{?rhel} <= 8) @@ -1031,6 +1026,10 @@ 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 @@ -1269,14 +1268,11 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \; %endif -%if %use_dnf -%files -n dnf-plugin-subscription-manager +%if %{use_libdnf} +%files -n libdnf-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} @@ -1445,6 +1441,32 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Oct 07 2020 Christopher Snyder 1.28.4-1 +- Revert the --no-insights feature (csnyder@redhat.com) +- adding Jenkinsfile and CI test scripts (jmolet@redhat.com) +- 1847910: DNF plugins are part of sub-man RPM, libdnf RPM; ENT-2536 + (jhnidek@redhat.com) +- 1826300: Ignore auto-attach, when SCA mode is used; ENT-2341 + (jhnidek@redhat.com) +- 1862431: option validation error from unexpected config entry; ENT-2712 + (wpoteat@redhat.com) +- 1844508: sub-man sends version in the User-Agent header; ENT-2486 + (wpoteat@redhat.com) +- 1855437: syspurpose CLI should require sub-man rpm; ENT-2602 + (jhnidek@redhat.com) +- 1870567: Fix issue with locale and D-Bus method GetStatus; ENT-2772 + (jhnidek@redhat.com) +- 1868734: Fix issue with syspurpose attrs. set in act. key; ENT-2851 + (jhnidek@redhat.com) + +* Wed Sep 02 2020 William Poteat 1.28.3-1 +- 1753236: D-Bus Register properly, when org not specified; ENT-2096 + (jhnidek@redhat.com) +- Additional updates for fedora (wpoteat@redhat.com) +- added default for repo_gpgcheck (p.seiler@linuxmail.org) +- support to disable repo_gpgcheck for zypper repositories + (p.seiler@linuxmail.org) + * Fri Aug 21 2020 William Poteat 1.28.2-1 - Sync spec with fedora spec (csnyder@redhat.com) - 1841601: Set default encoding properly; ENT-2499 (jhnidek@redhat.com)