From 5a76cf23cf913dde0098f053af30cbedaaf40958fae746671d7eac6c267a19dd Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Thu, 21 Jul 2022 13:05:16 +0000 Subject: [PATCH] Accepting request 989742 from home:bnavigator:branches:devel:languages:python - Work around vendored distutils in setuptools >= 60 incorrectly installing pkgconfig files into the wrong libdir OBS-URL: https://build.opensuse.org/request/show/989742 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject?expand=0&rev=139 --- python-gobject.changes | 6 ++++++ python-gobject.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/python-gobject.changes b/python-gobject.changes index 4eb6522..9bb8acf 100644 --- a/python-gobject.changes +++ b/python-gobject.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 16 22:53:44 UTC 2022 - Ben Greiner + +- Work around vendored distutils in setuptools >= 60 incorrectly + installing pkgconfig files into the wrong libdir + ------------------------------------------------------------------- Thu Jun 9 12:51:17 UTC 2022 - Dominique Leuenberger diff --git a/python-gobject.spec b/python-gobject.spec index adb64f5..dd15055 100644 --- a/python-gobject.spec +++ b/python-gobject.spec @@ -124,6 +124,12 @@ export CFLAGS="%{optflags}" %install %python_install +# Incorrectly installed by a python38-setuptools vendored distutils +# which does not play well with the distro patched python38. +# Later flavors installed the correct files into lib64 as well +if [ "%{_libdir}" != "%{_prefix}/lib" -a -d %{buildroot}%{_prefix}/lib/pkgconfig ]; then + rm -r %{buildroot}%{_prefix}/lib/pkgconfig +fi %{python_expand # delete unwanted python scripts and their compiled cache files # Drop pygtkcompat layer - It's useless and we lack other stuff for it to work