commit 8022507927012b1ed67f44c1ca6d75627f39adbd
Author: Jan Rękorajski <[email protected]>
Date: Tue Apr 26 23:28:19 2022 +0200
- keep purelib in sync with python3 package to properly support multilib
installs, rel 2
multilib.patch | 18 ++++++++++++++++++
python3-setuptools.spec | 4 +++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/python3-setuptools.spec b/python3-setuptools.spec
index 0b8f342..df9b78e 100644
--- a/python3-setuptools.spec
+++ b/python3-setuptools.spec
@@ -17,7 +17,7 @@ Summary: A collection of enhancements to the Python
distutils
Summary(pl.UTF-8): Zestaw rozszerzeń dla pythonowych distutils
Name: python3-setuptools
Version: 62.0.0
-Release: 1
+Release: 2
Epoch: 1
License: MIT
Group: Development/Languages/Python
@@ -25,6 +25,7 @@ Group: Development/Languages/Python
Source0:
https://github.com/pypa/setuptools/archive/v%{version}/%{pypi_name}-%{version}.tar.gz
# Source0-md5: 7f932b83c8c74751a2f1e60cd569189b
Patch0: setuptools-missing.patch
+Patch1: multilib.patch
URL: https://github.com/pypa/setuptools
%if %(locale -a | grep -q '^C\.utf8$'; echo $?)
BuildRequires: glibc-localedb-all
@@ -117,6 +118,7 @@ Dokumentacja API %{module}.
%prep
%setup -q -n %{module}-%{version}
%patch0 -p1
+%patch1 -p1
%if %{with system_libs}
exit 1 # TODO: unvendor modules from pkg_resources/_vendor
diff --git a/multilib.patch b/multilib.patch
new file mode 100644
index 0000000..e843f65
--- /dev/null
+++ b/multilib.patch
@@ -0,0 +1,18 @@
+--- setuptools-62.0.0/setuptools/_distutils/sysconfig.py.orig 2022-04-26
23:24:21.684034857 +0200
++++ setuptools-62.0.0/setuptools/_distutils/sysconfig.py 2022-04-26
23:24:40.750464254 +0200
+@@ -170,13 +170,13 @@
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
+
+ if os.name == "posix":
+- if plat_specific or standard_lib:
++ if plat_specific or standard_lib or prefix != "/usr":
+ # Platform-specific modules (any module from a non-pure-Python
+ # module distribution) or standard Python library modules.
+ libdir = getattr(sys, "platlibdir", "lib")
+ else:
+ # Pure Python
+- libdir = "lib"
++ libdir = "share"
+ implementation = 'pypy' if IS_PYPY else 'python'
+ libpython = os.path.join(prefix, libdir,
+ implementation + get_python_version())
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python3-setuptools.git/commitdiff/8022507927012b1ed67f44c1ca6d75627f39adbd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
