Debrand for AlmaLinux

This commit is contained in:
Eduard Abdullin 2025-05-15 03:55:53 +00:00 committed by root
commit 4fe47cbf9d
2 changed files with 164 additions and 171 deletions

View File

@ -1 +1 @@
SHA512 (subscription-manager-1.30.6.tar.gz) = 9122fc3c331aa883ce2ec5d2a188c611475c2059af267101dead14fce57be40fbb20b5998b8dad4db06547d9bbc3ef1c2ae1563b3f0b426fb42d791d393f470b SHA512 (subscription-manager-1.30.7.tar.gz) = 41af60d28b1f30db14c25bb35a3a24c8c6f240f7c6141fd1a096be46b2aad6c3a38b8ac0628bbb4c5d3818e4b2ac77d7e5331a755224dd73f09275523ec56620

View File

@ -14,8 +14,6 @@
%global completion_dir %{_datadir}/bash-completion/completions %global completion_dir %{_datadir}/bash-completion/completions
%global run_dir /run
%global rhsm_plugins_dir /usr/share/rhsm-plugins %global rhsm_plugins_dir /usr/share/rhsm-plugins
%if 0%{?suse_version} %if 0%{?suse_version}
@ -24,17 +22,7 @@
%endif %endif
%global use_dnf (0%{?fedora} || (0%{?rhel})) %global use_dnf (0%{?fedora} || (0%{?rhel}))
%global create_libdnf_rpm (0%{?fedora} || 0%{?rhel} > 8) %global create_libdnf_rpm (0%{?fedora} || 0%{?rhel})
%global python_sitearch %python3_sitearch
%global python_sitelib %python3_sitelib
%global __python %__python3
%if 0%{?suse_version}
%global py_package_prefix python3
%else
%global py_package_prefix python%{python3_pkgversion}
%endif
%global rhsm_package_name %{py_package_prefix}-subscription-manager-rhsm
%global _hardened_build 1 %global _hardened_build 1
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now} %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now}
@ -95,7 +83,7 @@
%global exclude_packages %{exclude_packages}" %global exclude_packages %{exclude_packages}"
Name: subscription-manager Name: subscription-manager
Version: 1.30.6 Version: 1.30.7
Release: 1%{?dist}.alma.1 Release: 1%{?dist}.alma.1
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}
@ -134,47 +122,51 @@ Patch1000: almalinux_debrand.patch
# at the start of a line making meaningful indentation impossible. # at the start of a line making meaningful indentation impossible.
Requires: iproute Requires: iproute
Requires: %{py_package_prefix}-iniparse Requires: python3-iniparse
Requires: %{py_package_prefix}-decorator Requires: python3-decorator
Requires: virt-what Requires: virt-what
Requires: %{rhsm_package_name} = %{version} Requires: python3-subscription-manager-rhsm = %{version}-%{release}
Requires: subscription-manager-rhsm-certificates Requires: subscription-manager-rhsm-certificates
%ifarch %{dmidecode_arches} %ifarch %{dmidecode_arches}
Requires: dmidecode Requires: dmidecode
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: %{py_package_prefix}-python-dateutil Requires: python3-python-dateutil
Requires: %{py_package_prefix}-dbus-python Requires: python3-dbus-python
Requires: logrotate Requires: logrotate
Requires: cron Requires: cron
Requires: %{py_package_prefix}-gobject2 Requires: python3-gobject2
Requires: libzypp Requires: libzypp
Requires: %{py_package_prefix}-zypp-plugin Requires: python3-zypp-plugin
%else %else
Requires: %{py_package_prefix}-dateutil Requires: python3-dateutil
Requires: %{py_package_prefix}-dbus Requires: python3-dbus
Requires: python3-gobject-base Requires: python3-gobject-base
%endif %endif
# rhel 8 has different naming for setuptools going forward
# on newer rhels and Fedora setuptools is not needed on runtime at all
%if (0%{?rhel} && 0%{?rhel} == 8)
Requires: platform-python-setuptools
%endif
%if %{use_dnf} %if %{use_dnf}
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: json-c-devel
BuildRequires: libdnf-devel >= 0.22.5
%if %{create_libdnf_rpm} %if %{create_libdnf_rpm}
Requires: python3-dnf Requires: python3-dnf
Requires: python3-dnf-plugins-core Requires: python3-dnf-plugins-core
Requires: python3-librepo Requires: python3-librepo
# The libdnf plugin is in a separate RPM, but subscription-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}-%{release}
# The dnf plugin is now part of subscription-manager
Obsoletes: dnf-plugin-subscription-manager < 1.29.0
%else %else
Requires: dnf-plugin-subscription-manager = %{version} Requires: dnf-plugin-subscription-manager = %{version}-%{release}
%endif %endif
%endif %endif
%if %use_inotify %if %use_inotify
Requires: %{py_package_prefix}-inotify Requires: python3-inotify
%endif %endif
Requires(post): systemd Requires(post): systemd
@ -183,10 +175,10 @@ Requires(postun): systemd
Requires: python3-cloud-what = %{version}-%{release} Requires: python3-cloud-what = %{version}-%{release}
BuildRequires: %{py_package_prefix}-devel BuildRequires: python3-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: gcc BuildRequires: gcc
BuildRequires: %{py_package_prefix}-setuptools BuildRequires: python3-setuptools
BuildRequires: gettext BuildRequires: gettext
BuildRequires: glib2-devel BuildRequires: glib2-devel
@ -195,10 +187,10 @@ BuildRequires: distribution-release
BuildRequires: libzypp BuildRequires: libzypp
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: python3-rpm-macros BuildRequires: python3-rpm-macros
BuildRequires: %{py_package_prefix}-python-dateutil BuildRequires: python3-python-dateutil
%else %else
BuildRequires: system-release BuildRequires: system-release
BuildRequires: %{py_package_prefix}-dateutil BuildRequires: python3-dateutil
%endif %endif
BuildRequires: systemd BuildRequires: systemd
@ -213,18 +205,7 @@ Obsoletes: rhsm-gtk <= %{version}-%{release}
Obsoletes: subscription-manager-plugin-container <= %{version} Obsoletes: subscription-manager-plugin-container <= %{version}
%endif %endif
%if %{use_dnf} Obsoletes: python3-syspurpose <= %{version}
%if %{create_libdnf_rpm}
# 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 < 1.29.0
%endif
%endif
Obsoletes: %{py_package_prefix}-syspurpose <= %{version}
%description %description
The Subscription Manager package provides programs and libraries to allow users The Subscription Manager package provides programs and libraries to allow users
@ -248,10 +229,6 @@ from the server. Populates /etc/docker/certs.d appropriately.
%if %{create_libdnf_rpm} %if %{create_libdnf_rpm}
%package -n libdnf-plugin-subscription-manager %package -n libdnf-plugin-subscription-manager
Summary: Subscription Manager plugin for libdnf Summary: Subscription Manager plugin for libdnf
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: json-c-devel
BuildRequires: libdnf-devel >= 0.22.5
Obsoletes: dnf-plugin-subscription-manager < 1.29.0 Obsoletes: dnf-plugin-subscription-manager < 1.29.0
@ -266,13 +243,7 @@ e.g. microdnf.
%package -n dnf-plugin-subscription-manager %package -n dnf-plugin-subscription-manager
Summary: Subscription Manager plugins for DNF Summary: Subscription Manager plugins for DNF
%if (0%{?fedora} || 0%{?rhel})
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: json-c-devel
BuildRequires: libdnf-devel >= 0.22.5
Requires: libdnf%{?_isa} >= 0.22.5 Requires: libdnf%{?_isa} >= 0.22.5
%endif
Requires: python3-dnf-plugins-core Requires: python3-dnf-plugins-core
Requires: python3-librepo Requires: python3-librepo
@ -284,18 +255,6 @@ from an entitlement platform; contains subscription-manager and
product-id plugins. product-id plugins.
%endif %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
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 %endif
@ -303,9 +262,9 @@ package or when debugging this package.
%package -n subscription-manager-plugin-ostree %package -n subscription-manager-plugin-ostree
Summary: A plugin for handling OSTree content. Summary: A plugin for handling OSTree content.
Requires: %{py_package_prefix}-gobject-base Requires: python3-gobject-base
# plugin needs a slightly newer version of python-iniparse for 'tidy' # plugin needs a slightly newer version of python-iniparse for 'tidy'
Requires: %{py_package_prefix}-iniparse >= 0.4 Requires: python3-iniparse >= 0.4
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n subscription-manager-plugin-ostree %description -n subscription-manager-plugin-ostree
@ -315,7 +274,7 @@ the remote in the currently deployed .origin file.
%endif %endif
%package -n %{rhsm_package_name} %package -n python3-subscription-manager-rhsm
Summary: A Python library to communicate with a Unified Entitlement Platform Summary: A Python library to communicate with a Unified Entitlement Platform
%if 0%{?suse_version} %if 0%{?suse_version}
Group: Development/Libraries/Python Group: Development/Libraries/Python
@ -323,14 +282,14 @@ Group: Development/Libraries/Python
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: %{py_package_prefix}-python-dateutil Requires: python3-python-dateutil
%else %else
Requires: %{py_package_prefix}-dateutil Requires: python3-dateutil
%endif %endif
Requires: %{py_package_prefix}-iniparse Requires: python3-iniparse
Requires: subscription-manager-rhsm-certificates Requires: subscription-manager-rhsm-certificates
# Required by Fedora packaging guidelines # Required by Fedora packaging guidelines
%{?python_provide:%python_provide %{py_package_prefix}-rhsm} %{?python_provide:%python_provide python3-rhsm}
Requires: python3-cloud-what = %{version}-%{release} Requires: python3-cloud-what = %{version}-%{release}
Requires: python3-rpm Requires: python3-rpm
Provides: python3-rhsm = %{version}-%{release} Provides: python3-rhsm = %{version}-%{release}
@ -338,7 +297,7 @@ Obsoletes: python3-rhsm <= 1.20.3-1
Provides: python-rhsm = %{version}-%{release} Provides: python-rhsm = %{version}-%{release}
Obsoletes: python-rhsm <= 1.20.3-1 Obsoletes: python-rhsm <= 1.20.3-1
%description -n %{rhsm_package_name} %description -n python3-subscription-manager-rhsm
A small library for communicating with the REST interface of a Unified A small library for communicating with the REST interface of a Unified
Entitlement Platform. This interface is used for the management of system Entitlement Platform. This interface is used for the management of system
entitlements, certificates, and access to content. entitlements, certificates, and access to content.
@ -368,27 +327,23 @@ cloud metadata and signatures.
%build %build
make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \ make -f Makefile VERSION=%{version}-%{release} CFLAGS="%{optflags}" \
LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python}" \ LDFLAGS="%{__global_ldflags}" OS_DIST="%{dist}" PYTHON="%{__python3}" \
%{?subpackages} %{exclude_packages} %{?subpackages} %{exclude_packages}
%if %{use_dnf} %if %{use_dnf}
pushd src/plugins/libdnf pushd src/plugins/libdnf
%cmake -DCMAKE_BUILD_TYPE="Release" %cmake -DCMAKE_BUILD_TYPE="Release"
%if (0%{?rhel} && 0%{?rhel} <= 8)
%make_build
%else
%cmake_build %cmake_build
%endif
popd popd
%endif %endif
%install %install
make -f Makefile install VERSION=%{version}-%{release} \ make -f Makefile install VERSION=%{version}-%{release} \
PYTHON=%{__python} PREFIX=%{_prefix} \ PYTHON=%{__python3} PREFIX=%{_prefix} \
DESTDIR=%{buildroot} PYTHON_SITELIB=%{python_sitearch} \ DESTDIR=%{buildroot} PYTHON_SITELIB=%{python3_sitearch} \
OS_VERSION=%{?fedora}%{?rhel}%{?suse_version} OS_DIST=%{dist} \ OS_VERSION=%{?fedora}%{?rhel}%{?suse_version} OS_DIST=%{dist} \
COMPLETION_DIR=%{completion_dir} \ COMPLETION_DIR=%{completion_dir} \
RUN_DIR=%{run_dir} \ RUN_DIR=%{_rundir} \
SBIN_DIR=%{_sbindir} \ SBIN_DIR=%{_sbindir} \
%{?install_ostree} %{?install_container} \ %{?install_ostree} %{?install_container} \
%{?install_dnf_plugins} \ %{?install_dnf_plugins} \
@ -399,11 +354,7 @@ make -f Makefile install VERSION=%{version}-%{release} \
%if %{use_dnf} %if %{use_dnf}
pushd src/plugins/libdnf pushd src/plugins/libdnf
mkdir -p %{buildroot}%{_libdir}/libdnf/plugins mkdir -p %{buildroot}%{_libdir}/libdnf/plugins
%if (0%{?rhel} && 0%{?rhel} <= 8)
%make_install
%else
%cmake_install %cmake_install
%endif
popd popd
%endif %endif
@ -464,19 +415,19 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%endif %endif
%dir %{python_sitearch}/rhsmlib/candlepin %dir %{python3_sitearch}/rhsmlib/candlepin
%dir %{python_sitearch}/rhsmlib/dbus %dir %{python3_sitearch}/rhsmlib/dbus
%dir %{python_sitearch}/rhsmlib/dbus/facts %dir %{python3_sitearch}/rhsmlib/dbus/facts
%dir %{python_sitearch}/rhsmlib/dbus/objects %dir %{python3_sitearch}/rhsmlib/dbus/objects
%dir %{python_sitearch}/rhsmlib/facts %dir %{python3_sitearch}/rhsmlib/facts
%dir %{python_sitearch}/rhsmlib/services %dir %{python3_sitearch}/rhsmlib/services
%dir %{python_sitearch}/subscription_manager-%{version}-*.egg-info %dir %{python3_sitearch}/subscription_manager-%{version}-*.egg-info
%dir %{python_sitearch}/subscription_manager/api %dir %{python3_sitearch}/subscription_manager/api
%dir %{python_sitearch}/subscription_manager/branding %dir %{python3_sitearch}/subscription_manager/branding
%dir %{python_sitearch}/subscription_manager/cli_command %dir %{python3_sitearch}/subscription_manager/cli_command
%dir %{python_sitearch}/subscription_manager/model %dir %{python3_sitearch}/subscription_manager/model
%dir %{python_sitearch}/subscription_manager/plugin %dir %{python3_sitearch}/subscription_manager/plugin
%dir %{python_sitearch}/subscription_manager/scripts %dir %{python3_sitearch}/subscription_manager/scripts
%dir %{_var}/spool/rhsm %dir %{_var}/spool/rhsm
%attr(755,root,root) %{_sbindir}/subscription-manager %attr(755,root,root) %{_sbindir}/subscription-manager
@ -512,7 +463,7 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%attr(755,root,root) %dir %{_var}/log/rhsm %attr(755,root,root) %dir %{_var}/log/rhsm
%attr(755,root,root) %dir %{_var}/spool/rhsm/debug %attr(755,root,root) %dir %{_var}/spool/rhsm/debug
%ghost %attr(755,root,root) %dir %{run_dir}/rhsm %ghost %attr(755,root,root) %dir %{_rundir}/rhsm
%attr(750,root,root) %dir %{_var}/lib/rhsm %attr(750,root,root) %dir %{_var}/lib/rhsm
%attr(750,root,root) %dir %{_var}/lib/rhsm/facts %attr(750,root,root) %dir %{_var}/lib/rhsm/facts
%attr(750,root,root) %dir %{_var}/lib/rhsm/packages %attr(750,root,root) %dir %{_var}/lib/rhsm/packages
@ -526,24 +477,24 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%{_sysusersdir}/rhsm.conf %{_sysusersdir}/rhsm.conf
%dir %{python_sitearch}/subscription_manager %dir %{python3_sitearch}/subscription_manager
# code, python modules and packages # code, python modules and packages
%{python_sitearch}/subscription_manager-*.egg-info/* %{python3_sitearch}/subscription_manager-*.egg-info/*
%{python_sitearch}/subscription_manager/*.py* %{python3_sitearch}/subscription_manager/*.py*
%{python_sitearch}/subscription_manager/api/*.py* %{python3_sitearch}/subscription_manager/api/*.py*
%{python_sitearch}/subscription_manager/branding/*.py* %{python3_sitearch}/subscription_manager/branding/*.py*
%{python_sitearch}/subscription_manager/cli_command/*.py* %{python3_sitearch}/subscription_manager/cli_command/*.py*
%{python_sitearch}/subscription_manager/model/*.py* %{python3_sitearch}/subscription_manager/model/*.py*
%{python_sitearch}/subscription_manager/plugin/__init__.py* %{python3_sitearch}/subscription_manager/plugin/__init__.py*
%{python_sitearch}/subscription_manager/scripts/*.py* %{python3_sitearch}/subscription_manager/scripts/*.py*
%{python_sitearch}/subscription_manager/__pycache__ %{python3_sitearch}/subscription_manager/__pycache__
%{python_sitearch}/subscription_manager/api/__pycache__ %{python3_sitearch}/subscription_manager/api/__pycache__
%{python_sitearch}/subscription_manager/branding/__pycache__ %{python3_sitearch}/subscription_manager/branding/__pycache__
%{python_sitearch}/subscription_manager/cli_command/__pycache__ %{python3_sitearch}/subscription_manager/cli_command/__pycache__
%{python_sitearch}/subscription_manager/model/__pycache__ %{python3_sitearch}/subscription_manager/model/__pycache__
%{python_sitearch}/subscription_manager/plugin/__pycache__ %{python3_sitearch}/subscription_manager/plugin/__pycache__
%{python_sitearch}/subscription_manager/scripts/__pycache__ %{python3_sitearch}/subscription_manager/scripts/__pycache__
# subscription-manager plugins # subscription-manager plugins
%dir %{rhsm_plugins_dir} %dir %{rhsm_plugins_dir}
@ -551,30 +502,30 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
# When libdnf rpm is created, then dnf plugin is part of subscription-manager rpm # When libdnf rpm is created, then dnf plugin is part of subscription-manager rpm
%if %{create_libdnf_rpm} %if %{create_libdnf_rpm}
%{python_sitelib}/dnf-plugins/* %{python3_sitelib}/dnf-plugins/*
%endif %endif
# rhsmlib # rhsmlib
%dir %{python_sitearch}/rhsmlib %dir %{python3_sitearch}/rhsmlib
%{python_sitearch}/rhsmlib/*.py* %{python3_sitearch}/rhsmlib/*.py*
%{python_sitearch}/rhsmlib/candlepin/*.py* %{python3_sitearch}/rhsmlib/candlepin/*.py*
%{python_sitearch}/rhsmlib/facts/*.py* %{python3_sitearch}/rhsmlib/facts/*.py*
%{python_sitearch}/rhsmlib/services/*.py* %{python3_sitearch}/rhsmlib/services/*.py*
%{python_sitearch}/rhsmlib/dbus/*.py* %{python3_sitearch}/rhsmlib/dbus/*.py*
%{python_sitearch}/rhsmlib/dbus/facts/*.py* %{python3_sitearch}/rhsmlib/dbus/facts/*.py*
%{python_sitearch}/rhsmlib/dbus/objects/*.py* %{python3_sitearch}/rhsmlib/dbus/objects/*.py*
%{python_sitearch}/rhsmlib/__pycache__ %{python3_sitearch}/rhsmlib/__pycache__
%{python_sitearch}/rhsmlib/candlepin/__pycache__ %{python3_sitearch}/rhsmlib/candlepin/__pycache__
%{python_sitearch}/rhsmlib/dbus/__pycache__ %{python3_sitearch}/rhsmlib/dbus/__pycache__
%{python_sitearch}/rhsmlib/dbus/facts/__pycache__ %{python3_sitearch}/rhsmlib/dbus/facts/__pycache__
%{python_sitearch}/rhsmlib/dbus/objects/__pycache__ %{python3_sitearch}/rhsmlib/dbus/objects/__pycache__
%{python_sitearch}/rhsmlib/facts/__pycache__ %{python3_sitearch}/rhsmlib/facts/__pycache__
%{python_sitearch}/rhsmlib/services/__pycache__ %{python3_sitearch}/rhsmlib/services/__pycache__
# syspurpose # syspurpose
%dir %{python_sitearch}/syspurpose %dir %{python3_sitearch}/syspurpose
%{python_sitearch}/syspurpose/*.py* %{python3_sitearch}/syspurpose/*.py*
%{python_sitearch}/syspurpose/__pycache__ %{python3_sitearch}/syspurpose/__pycache__
%{_datadir}/polkit-1/actions/com.redhat.*.policy %{_datadir}/polkit-1/actions/com.redhat.*.policy
%{_datadir}/dbus-1/system-services/com.redhat.*.service %{_datadir}/dbus-1/system-services/com.redhat.*.service
@ -586,15 +537,15 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%attr(644,root,root) %{_tmpfilesdir}/%{name}.conf %attr(644,root,root) %{_tmpfilesdir}/%{name}.conf
# Incude rt CLI tool # Incude rt CLI tool
%dir %{python_sitearch}/rct %dir %{python3_sitearch}/rct
%{python_sitearch}/rct/*.py* %{python3_sitearch}/rct/*.py*
%{python_sitearch}/rct/__pycache__ %{python3_sitearch}/rct/__pycache__
%attr(755,root,root) %{_bindir}/rct %attr(755,root,root) %{_bindir}/rct
# Include consumer debug CLI tool # Include consumer debug CLI tool
%dir %{python_sitearch}/rhsm_debug %dir %{python3_sitearch}/rhsm_debug
%{python_sitearch}/rhsm_debug/*.py* %{python3_sitearch}/rhsm_debug/*.py*
%{python_sitearch}/rhsm_debug/__pycache__ %{python3_sitearch}/rhsm_debug/__pycache__
%attr(755,root,root) %{_bindir}/rhsm-debug %attr(755,root,root) %{_bindir}/rhsm-debug
%doc %doc
@ -611,8 +562,8 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%{_sysconfdir}/rhsm/pluginconf.d/container_content.ContainerContentPlugin.conf %{_sysconfdir}/rhsm/pluginconf.d/container_content.ContainerContentPlugin.conf
%{rhsm_plugins_dir}/container_content.py* %{rhsm_plugins_dir}/container_content.py*
%{rhsm_plugins_dir}/__pycache__/*container* %{rhsm_plugins_dir}/__pycache__/*container*
%{python_sitearch}/subscription_manager/plugin/container/__pycache__ %{python3_sitearch}/subscription_manager/plugin/container/__pycache__
%{python_sitearch}/subscription_manager/plugin/container/*.py* %{python3_sitearch}/subscription_manager/plugin/container/*.py*
# Copying Red Hat CA cert into each directory: # Copying Red Hat CA cert into each directory:
%attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com %attr(755,root,root) %dir %{_sysconfdir}/docker/certs.d/cdn.redhat.com
@ -624,8 +575,8 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_sysconfdir}/rhsm/pluginconf.d/ostree_content.OstreeContentPlugin.conf %{_sysconfdir}/rhsm/pluginconf.d/ostree_content.OstreeContentPlugin.conf
%{rhsm_plugins_dir}/ostree_content.py* %{rhsm_plugins_dir}/ostree_content.py*
%{python_sitearch}/subscription_manager/plugin/ostree/*.py* %{python3_sitearch}/subscription_manager/plugin/ostree/*.py*
%{python_sitearch}/subscription_manager/plugin/ostree/__pycache__ %{python3_sitearch}/subscription_manager/plugin/ostree/__pycache__
%{rhsm_plugins_dir}/__pycache__/*ostree* %{rhsm_plugins_dir}/__pycache__/*ostree*
%endif %endif
@ -640,26 +591,26 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
# DNF RPM # DNF RPM
%files -n dnf-plugin-subscription-manager %files -n dnf-plugin-subscription-manager
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{python_sitelib}/dnf-plugins/* %{python3_sitelib}/dnf-plugins/*
%{_libdir}/libdnf/plugins/product-id.so %{_libdir}/libdnf/plugins/product-id.so
%endif %endif
%endif %endif
%files -n %{rhsm_package_name} %files -n python3-subscription-manager-rhsm
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{python_sitearch}/rhsm %dir %{python3_sitearch}/rhsm
%{python_sitearch}/rhsm/* %{python3_sitearch}/rhsm/*
%files -n python3-cloud-what %files -n python3-cloud-what
%defattr(-,root,root,-) %defattr(-,root,root,-)
%attr(750,root,root) %dir %{_var}/cache/cloud-what %attr(750,root,root) %dir %{_var}/cache/cloud-what
%dir %{python_sitearch}/cloud_what %dir %{python3_sitearch}/cloud_what
%dir %{python_sitearch}/cloud_what/providers %dir %{python3_sitearch}/cloud_what/providers
%{python_sitearch}/cloud_what/*.py* %{python3_sitearch}/cloud_what/*.py*
%{python_sitearch}/cloud_what/providers/*.py* %{python3_sitearch}/cloud_what/providers/*.py*
%{python_sitearch}/cloud_what/__pycache__ %{python3_sitearch}/cloud_what/__pycache__
%{python_sitearch}/cloud_what/providers/__pycache__ %{python3_sitearch}/cloud_what/providers/__pycache__
%pre %pre
@ -680,15 +631,6 @@ find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%systemd_post rhsmcertd.service %systemd_post rhsmcertd.service
%endif %endif
# When subscription-manager is upgraded on RHEL 8 (from RHEL 8.2 to RHEL 8.3), then kill
# instance of rhsmd, because it is not necessary anymore and it can cause issues.
# See: https://bugzilla.redhat.com/show_bug.cgi?id=1840364
%if ( 0%{?rhel} || 0%{?fedora} )
if [ "$1" = "2" ] ; then
killall rhsmd 2> /dev/null || true
fi
%endif
# Make all consumer certificates and keys readable by group rhsm # Make all consumer certificates and keys readable by group rhsm
find /etc/pki/consumer -mindepth 1 -maxdepth 1 -name '*.pem' | xargs --no-run-if-empty chgrp rhsm find /etc/pki/consumer -mindepth 1 -maxdepth 1 -name '*.pem' | xargs --no-run-if-empty chgrp rhsm
find /etc/pki/consumer -mindepth 1 -maxdepth 1 -name '*.pem' | xargs --no-run-if-empty chmod g+r find /etc/pki/consumer -mindepth 1 -maxdepth 1 -name '*.pem' | xargs --no-run-if-empty chmod g+r
@ -703,7 +645,7 @@ fi
%if %{use_container_plugin} %if %{use_container_plugin}
%post -n subscription-manager-plugin-container %post -n subscription-manager-plugin-container
%{__python} %{rhsm_plugins_dir}/container_content.py || : %{__python3} %{rhsm_plugins_dir}/container_content.py || :
%endif %endif
%preun %preun
@ -734,16 +676,67 @@ fi
%systemd_posttrans_with_restart rhsm.service %systemd_posttrans_with_restart rhsm.service
# Remove old *.egg-info empty directories not removed be previous versions of RPMs # 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 # due to this BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1927245
rmdir %{python_sitearch}/subscription_manager-*-*.egg-info --ignore-fail-on-non-empty rmdir %{python3_sitearch}/subscription_manager-*-*.egg-info --ignore-fail-on-non-empty
# Remove old cache files # Remove old cache files
# The -f flag ensures that exit code 0 will be returned even if the file does not exist. # The -f flag ensures that exit code 0 will be returned even if the file does not exist.
rm -f /var/lib/rhsm/cache/rhsm_icon.json rm -f /var/lib/rhsm/cache/rhsm_icon.json
rm -f /var/lib/rhsm/cache/content_access_mode.json rm -f /var/lib/rhsm/cache/content_access_mode.json
%changelog %changelog
* Fri Mar 07 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1.30.6-1.alma.1 * Thu May 15 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1.30.7-1.alma.1
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Wed May 14 2025 Jiri Hnidek <jhnidek@redhat.com> 1.30.7-1
- Translated using Weblate (Georgian) (temuri.doghonadze@gmail.com)
- Translated using Weblate (Italian) (noreply-mt-weblate-translation-
memory@weblate.org)
- Translated using Weblate (Italian) (info@salvatorecocuzza.it)
- Translated using Weblate (Spanish) (fserrador@gmail.com)
- Translated using Weblate (Chinese (Traditional) (zh_TW)) (chzang55@gmail.com)
- Translated using Weblate (Chinese (Traditional) (zh_TW)) (noreply-mt-weblate-
translation-memory@weblate.org)
- Translated using Weblate (Chinese (Traditional) (zh_TW)) (chzang55@gmail.com)
- Translated using Weblate (Japanese) (mhorky@redhat.com)
- Translated using Weblate (French) (leane.grasser@proton.me)
- fix: Unit test should ignore locale, when generating test timestamp
(jhnidek@redhat.com)
- fix: Handle improperly closed connections (mhorky@redhat.com)
- test: Added integration tests for activation keys (jstavel@redhat.com)
- test: Integration tests for DBus Unregister call (jhnidek@redhat.com)
- fix: Do not call removed bash script from tesh.sh (jhnidek@redhat.com)
- spec: drop old libdnf-plugin-subscription-manager-debuginfo definition
(ptoscano@redhat.com)
- spec: switch from an own run_dir to _rundir (ptoscano@redhat.com)
- spec: switch from python_sitelib to python3_sitelib (ptoscano@redhat.com)
- spec: switch from python_sitearch to python3_sitearch (ptoscano@redhat.com)
- spec: inline & drop rhsm_package_name (ptoscano@redhat.com)
- spec: switch from __python to __python3 (ptoscano@redhat.com)
- spec: inline & drop py_package_prefix (ptoscano@redhat.com)
- spec: remove redundant check (ptoscano@redhat.com)
- spec: deduplicate BuildRequires for use_dnf (ptoscano@redhat.com)
- spec: drop old %%post snippet for rhsmd (ptoscano@redhat.com)
- spec: drop EL 8 bits (ptoscano@redhat.com)
- ci: tweak the dependabot config for branches a bit (ptoscano@redhat.com)
- feat: remove no more needed branding strings (ptoscano@redhat.com)
- feat: drop ClassicCheck (ptoscano@redhat.com)
- ci: track also active stable branches with dependabot for GitHub actions
(ptoscano@redhat.com)
- tests: update location of pytest-client-tools (ptoscano@redhat.com)
- Handle URL params for AptRepoFiles (grigo@atix.de)
- fix: Append two additional facts to the graylist (pkoprda@redhat.com)
- refactor: Use class constant instead of variable graylist
(pkoprda@redhat.com)
- spec: Require subpackages from the same build as the base package
(debarshir@gnome.org)
- spec: Consolidate dependencies on the DNF & libdnf plugins in one place
(debarshir@gnome.org)
- spec: Fix grammar and spelling mistakes (debarshir@gnome.org)
- build: use cmake pkg-config imported targets (ptoscano@redhat.com)
- build: fix order of parameters for pkg_check_modules() (ptoscano@redhat.com)
- build: drop manual setting of -std=c99 (ptoscano@redhat.com)
- build: remove check for in source cmake builddir (ptoscano@redhat.com)
- build: bump cmake required version to 3.20 (ptoscano@redhat.com)
* Thu Mar 06 2025 Pino Toscano <ptoscano@redhat.com> 1.30.6-1 * Thu Mar 06 2025 Pino Toscano <ptoscano@redhat.com> 1.30.6-1
- Translated using Weblate (Italian) (toscano.pino@tiscali.it) - Translated using Weblate (Italian) (toscano.pino@tiscali.it)
- Translated using Weblate (Japanese) (ptoscano@redhat.com) - Translated using Weblate (Japanese) (ptoscano@redhat.com)