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#a7a613ce2f32578f1e66ee02ee9fd36c4d385b5b
This commit is contained in:
DistroBaker
parent
326e27d2c6
commit
aa32e37e26
4
.gitignore
vendored
4
.gitignore
vendored
@ -125,3 +125,7 @@
|
||||
/subscription-manager-cockpit-1.29.6.tar.gz
|
||||
/subscription-manager-1.29.7.tar.gz
|
||||
/subscription-manager-cockpit-1.29.7.tar.gz
|
||||
/subscription-manager-1.29.8.tar.gz
|
||||
/subscription-manager-cockpit-1.29.8.tar.gz
|
||||
/subscription-manager-1.29.9.tar.gz
|
||||
/subscription-manager-cockpit-1.29.9.tar.gz
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (subscription-manager-1.29.7.tar.gz) = 2a41fe14c440b08f29101aa0afd3aefe22166da179d20351c7c8dc3f84150ef04d94ce16ebdd22284cab542ab9cdf52d14ccb326585d4bc1d2fc74026de74b54
|
||||
SHA512 (subscription-manager-cockpit-1.29.7.tar.gz) = 4f078aa8ea291f7dfbd929c02fdd22954816efef7b2719ec35f6c17da740bdd489cb807d56f5d2c25dab09aaa20e490e802fc2bb96cde9bf1dd3ebb45ead49c3
|
||||
SHA512 (subscription-manager-1.29.9.tar.gz) = f3bea683272ea00558c9d1b4b6f19f98a1c808152fb6cee39c3bcc20ca402324005a21a16eb6eddd226264664c6cdadca4f4e3c14f26975fbef7e3c6223ebade
|
||||
SHA512 (subscription-manager-cockpit-1.29.9.tar.gz) = 2cd5aefc472866dbbec9db826c9cb589a7f979818af529581a88b685422e9c03fad9a10b6abb0bdc7a546824e8dc6265f38ecf469cead0715139c16cce840877
|
||||
|
||||
@ -119,8 +119,6 @@
|
||||
%global rhsm_package_name subscription-manager-rhsm
|
||||
%endif
|
||||
|
||||
%global include_syspurpose 1
|
||||
|
||||
%global _hardened_build 1
|
||||
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now}
|
||||
|
||||
@ -198,8 +196,6 @@
|
||||
%global with_cockpit WITH_COCKPIT=false
|
||||
%endif
|
||||
|
||||
%global subpackages SUBPACKAGES="%{?include_syspurpose:syspurpose}"
|
||||
|
||||
# Build a list of python package to exclude from the build.
|
||||
# This is necessary because we have multiple rpms which may or may not
|
||||
# need to be built depending on the distro which are all in one source tree.
|
||||
@ -244,7 +240,7 @@
|
||||
%global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
|
||||
|
||||
Name: subscription-manager
|
||||
Version: 1.29.7
|
||||
Version: 1.29.9
|
||||
Release: 1%{?dist}
|
||||
Summary: Tools and libraries for subscription and repository management
|
||||
%if 0%{?suse_version}
|
||||
@ -304,7 +300,6 @@ Requires: %{py_package_prefix}-python-dateutil
|
||||
BuildRequires: %{py_package_prefix}-dateutil
|
||||
Requires: %{py_package_prefix}-dateutil
|
||||
%endif
|
||||
Requires: %{py_package_prefix}-syspurpose = %{version}-%{release}
|
||||
|
||||
# rhel 8 has different naming for setuptools going forward
|
||||
%if (0%{?rhel} && 0%{?rhel} == 8)
|
||||
@ -415,28 +410,18 @@ Obsoletes: subscription-manager-plugin-container
|
||||
# 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
|
||||
Obsoletes: dnf-plugin-subscription-manager < 1.29.0
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Obsoletes: %{py_package_prefix}-syspurpose
|
||||
|
||||
%description
|
||||
The Subscription Manager package provides programs and libraries to allow users
|
||||
to manage subscriptions and yum repositories from the Red Hat entitlement
|
||||
platform.
|
||||
|
||||
|
||||
%package -n %{py_package_prefix}-syspurpose
|
||||
Summary: A commandline utility for declaring system syspurpose
|
||||
%if 0%{?suse_version}
|
||||
Group: Productivity/Networking/System
|
||||
%else
|
||||
Group: System Environment/Base
|
||||
%endif
|
||||
%description -n %{py_package_prefix}-syspurpose
|
||||
Provides the syspurpose commandline utility. This utility manages the
|
||||
system syspurpose.
|
||||
|
||||
|
||||
%if %{use_container_plugin}
|
||||
%package -n subscription-manager-plugin-container
|
||||
Summary: A plugin for handling container content
|
||||
@ -533,7 +518,8 @@ subscriptions
|
||||
%endif
|
||||
|
||||
%if %{use_dnf}
|
||||
# RPM containing DNF plugin
|
||||
|
||||
# RPM containing libdnf plugin
|
||||
%if %{create_libdnf_rpm}
|
||||
%package -n libdnf-plugin-subscription-manager
|
||||
Summary: Subscription Manager plugin for libdnf
|
||||
@ -542,36 +528,24 @@ 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
|
||||
|
||||
Obsoletes: dnf-plugin-subscription-manager < 1.29.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.
|
||||
|
||||
%else
|
||||
|
||||
# RPM containing DNF plugin
|
||||
%package -n dnf-plugin-subscription-manager
|
||||
Summary: Subscription Manager plugins for DNF
|
||||
@ -580,20 +554,57 @@ 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 || 0%{?fedora} < 29)
|
||||
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.
|
||||
%endif
|
||||
|
||||
# This redefinition of debuginfo package has to be here, because we
|
||||
# need to solve the issue described in this BZ:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1920568
|
||||
# We need to obsolete old dnf-sub-man-plugin-debuginfo RPM
|
||||
%package -n libdnf-plugin-subscription-manager-debuginfo
|
||||
Summary: Debug information for package libdnf-plugin-subscription-manager
|
||||
Group: Development/Debug
|
||||
Obsoletes: dnf-plugin-subscription-manager-debuginfo < 1.29.0
|
||||
%description -n libdnf-plugin-subscription-manager-debuginfo
|
||||
This package provides debug information for package libdnf-plugin-subscription-manager.
|
||||
Debug information is useful when developing applications that use this
|
||||
package or when debugging this package.
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
@ -786,7 +797,7 @@ subscription-manager-initial-setup-addon, and subscription-manager-cockpit-plugi
|
||||
%build
|
||||
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
|
||||
LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \
|
||||
%{?gtk_version} %{?subpackages} %{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \
|
||||
%{?gtk_version} %{?subpackages} \
|
||||
%{exclude_packages} %{?with_subman_gui} %{?with_subman_migration}
|
||||
|
||||
%if %{with python2_rhsm}
|
||||
@ -819,7 +830,6 @@ make -f Makefile install VERSION=%{version}-%{release} \
|
||||
%{?with_subman_migration} \
|
||||
%{?with_cockpit} \
|
||||
%{?subpackages} \
|
||||
%{?include_syspurpose:INCLUDE_SYSPURPOSE="1"} \
|
||||
%{?exclude_packages}
|
||||
|
||||
%if %{use_dnf}
|
||||
@ -859,9 +869,6 @@ desktop-file-validate %{buildroot}/usr/share/applications/subscription-manager-c
|
||||
%endif
|
||||
|
||||
%find_lang rhsm
|
||||
%if 0%{?include_syspurpose}
|
||||
%find_lang syspurpose
|
||||
%endif
|
||||
|
||||
# fake out the redhat.repo file
|
||||
%if %{use_yum} || %{use_dnf}
|
||||
@ -912,25 +919,34 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
# gnome-help tools use domain 'subscription-manager'
|
||||
%files -f rhsm.lang
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
# Make some unusual directories for suse part of subscription-manager
|
||||
%if 0%{?suse_version}
|
||||
%dir %{_sysconfdir}/pki
|
||||
%dir %{_prefix}/share/polkit-1
|
||||
%dir %{_prefix}/share/polkit-1/actions
|
||||
|
||||
# Suse specific
|
||||
%if %{use_yum}
|
||||
%dir %{_sysconfdir}/yum
|
||||
%dir %{_sysconfdir}/yum/pluginconf.d
|
||||
%dir %{_prefix}/lib/yum-plugins/
|
||||
%endif
|
||||
|
||||
# Suse specific
|
||||
%if %{use_dnf}
|
||||
%dir %{_sysconfdir}/dnf
|
||||
%dir %{_sysconfdir}/dnf/plugins
|
||||
%dir %{_prefix}/lib/dnf-plugins/
|
||||
%endif
|
||||
|
||||
# Suse specific
|
||||
%if %{use_yum} || %{use_dnf}
|
||||
%dir %{_sysconfdir}/yum.repos.d
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%dir %{python_sitearch}/rhsmlib/candlepin
|
||||
%dir %{python_sitearch}/rhsmlib/cloud
|
||||
%dir %{python_sitearch}/rhsmlib/cloud/providers
|
||||
@ -943,25 +959,25 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%dir %{python_sitearch}/subscription_manager-%{version}-*.egg-info
|
||||
%dir %{python_sitearch}/subscription_manager/api
|
||||
%dir %{python_sitearch}/subscription_manager/branding
|
||||
%dir %{python_sitearch}/subscription_manager/cli_command
|
||||
%dir %{python_sitearch}/subscription_manager/model
|
||||
%dir %{python_sitearch}/subscription_manager/plugin
|
||||
%dir %{python_sitearch}/subscription_manager/scripts
|
||||
%dir %{_var}/spool/rhsm
|
||||
%dir %{_prefix}/share/polkit-1
|
||||
%dir %{_prefix}/share/polkit-1/actions
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1315
|
||||
%dir %{_prefix}/share/locale/ta_IN
|
||||
%dir %{_prefix}/share/locale/ta_IN/LC_MESSAGES
|
||||
%endif
|
||||
|
||||
%attr(755,root,root) %{_sbindir}/subscription-manager
|
||||
|
||||
# symlink to console-helper
|
||||
%if !0%{?suse_version}
|
||||
%{_bindir}/subscription-manager
|
||||
%endif
|
||||
%attr(755,root,root) %{_bindir}/rhsmcertd
|
||||
|
||||
%attr(755,root,root) %{_bindir}/rhsmcertd
|
||||
%attr(755,root,root) %{_libexecdir}/rhsmcertd-worker
|
||||
|
||||
|
||||
@ -970,6 +986,10 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%attr(755,root,root) %dir %{_sysconfdir}/pki/entitlement
|
||||
%attr(755,root,root) %dir %{_sysconfdir}/rhsm
|
||||
%attr(755,root,root) %dir %{_sysconfdir}/rhsm/facts
|
||||
|
||||
%attr(755,root,root) %dir %{_sysconfdir}/rhsm/syspurpose
|
||||
%attr(644,root,root) %{_sysconfdir}/rhsm/syspurpose/valid_fields.json
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%attr(755,root,root) %dir %{_sysconfdir}/rhsm/zypper.repos.d
|
||||
%endif
|
||||
@ -1038,6 +1058,7 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%{python_sitearch}/subscription_manager/*.py*
|
||||
%{python_sitearch}/subscription_manager/api/*.py*
|
||||
%{python_sitearch}/subscription_manager/branding/*.py*
|
||||
%{python_sitearch}/subscription_manager/cli_command/*.py*
|
||||
%{python_sitearch}/subscription_manager/model/*.py*
|
||||
%{python_sitearch}/subscription_manager/plugin/__init__.py*
|
||||
%{python_sitearch}/subscription_manager/scripts/*.py*
|
||||
@ -1045,6 +1066,7 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%{python_sitearch}/subscription_manager/__pycache__
|
||||
%{python_sitearch}/subscription_manager/api/__pycache__
|
||||
%{python_sitearch}/subscription_manager/branding/__pycache__
|
||||
%{python_sitearch}/subscription_manager/cli_command/__pycache__
|
||||
%{python_sitearch}/subscription_manager/model/__pycache__
|
||||
%{python_sitearch}/subscription_manager/plugin/__pycache__
|
||||
%{python_sitearch}/subscription_manager/scripts/__pycache__
|
||||
@ -1112,6 +1134,13 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%{python_sitearch}/rhsmlib/services/__pycache__
|
||||
%endif
|
||||
|
||||
# syspurpose
|
||||
%dir %{python_sitearch}/syspurpose
|
||||
%{python_sitearch}/syspurpose/*.py
|
||||
%if %{with python3}
|
||||
%{python_sitearch}/syspurpose/__pycache__
|
||||
%endif
|
||||
|
||||
%{_datadir}/polkit-1/actions/com.redhat.*.policy
|
||||
%{_datadir}/dbus-1/system-services/com.redhat.*.service
|
||||
%attr(755,root,root) %{_libexecdir}/rhsm*-service
|
||||
@ -1258,23 +1287,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files -n %{py_package_prefix}-syspurpose -f syspurpose.lang
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{python_sitelib}/syspurpose*.egg-info
|
||||
%{python_sitelib}/syspurpose*.egg-info/*
|
||||
%dir %{_sysconfdir}/rhsm/syspurpose
|
||||
%dir %{python_sitelib}/syspurpose
|
||||
%{python_sitelib}/syspurpose/*.py*
|
||||
%if %{with python3}
|
||||
%{python_sitelib}/syspurpose/__pycache__
|
||||
%endif
|
||||
%doc %{_mandir}/man8/syspurpose.8.*
|
||||
%doc LICENSE
|
||||
|
||||
%attr(755, root, root) %{_sbindir}/syspurpose
|
||||
%attr(644,root,root) %{_sysconfdir}/rhsm/syspurpose/valid_fields.json
|
||||
%attr(644,root,root) %{completion_dir}/syspurpose
|
||||
|
||||
%if %{use_container_plugin}
|
||||
%files -n subscription-manager-plugin-container
|
||||
%defattr(-,root,root,-)
|
||||
@ -1382,9 +1394,14 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
|
||||
%{_datadir}/icons/hicolor/symbolic/apps/*.svg
|
||||
%endif
|
||||
|
||||
%pre
|
||||
|
||||
# Remove old *.egg-info empty directories not removed be previous versions of RPMs
|
||||
# due to this BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1927245
|
||||
rmdir %{python_sitearch}/subscription_manager-*-*.egg-info 2> /dev/null || true
|
||||
|
||||
%if %use_systemd
|
||||
%if 0%{?suse_version}
|
||||
%pre
|
||||
%service_add_pre rhsm.service
|
||||
%service_add_pre rhsm-facts.service
|
||||
%service_add_pre rhsmcertd.service
|
||||
@ -1506,6 +1523,41 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Mar 11 2021 Christopher Snyder <csnyder@redhat.com> 1.29.9-1
|
||||
- 1682943: add space to message to separate 2 sentences
|
||||
(tmerry@localhost.localdomain)
|
||||
- 1928667: Added UTC to the last_boot fact (ENT-3566) (#2456)
|
||||
(31166354+tlhmerry9@users.noreply.github.com)
|
||||
- 1608820: Check the Log Level to make sure it is valid, if not set it to INFO
|
||||
(#2468) (31166354+tlhmerry9@users.noreply.github.com)
|
||||
- Add nikos' auto assigner (csnyder@redhat.com)
|
||||
- Added translation using Weblate (Sinhala) (r45xveza@pm.me)
|
||||
- 1928072: Print warning message and don't do auto-attach (jhnidek@redhat.com)
|
||||
- Refactor managercli (#2453) (wpoteat@redhat.com)
|
||||
- 1924921: Fix getting releases, when SCA is used (jhnidek@redhat.com)
|
||||
|
||||
* Tue Mar 02 2021 Christopher Snyder <csnyder@redhat.com> 1.29.8-1
|
||||
- 1920568: Solve dependency between debuginfo packages (jhnidek@redhat.com)
|
||||
- ENT-3276: Merge syspurpose with subscription-manager (#2436)
|
||||
(jhnidek@redhat.com)
|
||||
- Revert "cockpit: Enable subscription-manager in dnf in tests (#2447)" (#2448)
|
||||
(martinpitt@users.noreply.github.com)
|
||||
- Update webpack and require webpack-cli as a dev dep (csnyder@redhat.com)
|
||||
- Release to fedora main branch instead of master (csnyder@redhat.com)
|
||||
- Add f34 target to the fedora releaser (csnyder@redhat.com)
|
||||
- cockpit: Enable subscription-manager in dnf in tests (#2447)
|
||||
(martinpitt@users.noreply.github.com)
|
||||
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (suanand@redhat.com)
|
||||
- 1927245: Mark several dir as part of RPM; ENT-3555 (jhnidek@redhat.com)
|
||||
- Update our fedora target to fedora32, default to f32 (csnyder@redhat.com)
|
||||
- Translated using Weblate (Chinese (Traditional) (zh_TW)) (jsefler@redhat.com)
|
||||
- Translated using Weblate (Chinese (Simplified) (zh_CN)) (jsefler@redhat.com)
|
||||
- Translated using Weblate (Chinese (Traditional) (zh_TW)) (jsefler@redhat.com)
|
||||
- 1922210: Typo in help text [master] (#2427) (wpoteat@redhat.com)
|
||||
- Translated using Weblate (Korean) (suanand@redhat.com)
|
||||
- Translated using Weblate (Japanese) (suanand@redhat.com)
|
||||
- Translated using Weblate (Korean) (ljanda@redhat.com)
|
||||
|
||||
* Tue Feb 02 2021 Christopher Snyder <csnyder@redhat.com> 1.29.7-1
|
||||
- 1878133: Deprecation message for syspurpose (#2421) (wpoteat@redhat.com)
|
||||
- 1922173: Repeat auto-register only, when first attempt fail (#2420)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user