From bb5c7d05d7d9d1756e63fcb3fba51475435cf0d5 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 4 Mar 2022 11:12:01 +0100 Subject: [PATCH] Don't BR setuptools, use Python's bundled distutils --- nfs-ganesha.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 53c12f0..1f6693f 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -115,7 +115,7 @@ Requires: openSUSE-release Name: nfs-ganesha Version: 4.0 -Release: 4%{?dev:%{dev}}%{?dist} +Release: 5%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki @@ -276,7 +276,6 @@ BuildRequires: python-devel %else Requires: python3-gobject, python3-pyparsing BuildRequires: python3-devel -BuildRequires: python3-setuptools %if ( 0%{?suse_version} ) Requires: dbus-1-python %else @@ -630,6 +629,14 @@ install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/g install -m 644 config_samples/gpfs.ganesha.exports.conf %{buildroot}%{_sysconfdir}/ganesha %endif +# setuptools >= 60 changes the environment to use its bundled copy of distutils +# by default, not the Python-bundled one. To run the Python's standard library +# distutils, the environment variable must be set. +# Although technically setuptools is not needed for the cmake scripts, if it's +# pulled by another package, it changes the environment and consequently, +# the build fails. This was reported in: +# https://github.com/pypa/setuptools/issues/3143 +export SETUPTOOLS_USE_DISTUTILS=stdlib %cmake_install %if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 ) @@ -894,6 +901,9 @@ exit 0 %endif %changelog +* Fri Mar 04 2022 Karolina Surma - 4.0-5 +- Don't BR setuptools, use Python's bundled distutils + * Fri Jan 28 2023 Kaleb S. KEITHLEY - 4.0-4 - NFS-Ganesha 4.1, w/ modern linker (mold), this time for real