From 4888862326237a763e68e1fee21d607fbb9ff4c9 Mon Sep 17 00:00:00 2001 From: Jacek Konieczny Date: Fri, 4 Dec 2015 08:22:04 +0100 Subject: [PATCH] Do not ask Python3 for module installation dirs Version: 1.714 --- rpm-build-macros.spec | 2 +- rpm.macros | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 2e93fdb..a37c053 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -1,4 +1,4 @@ -%define rpm_macros_rev 1.713 +%define rpm_macros_rev 1.714 %define find_lang_rev 1.37 Summary: PLD Linux RPM build macros Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD diff --git a/rpm.macros b/rpm.macros index d4b761a..5d4c741 100644 --- a/rpm.macros +++ b/rpm.macros @@ -1095,11 +1095,10 @@ fi \ # directories %py3_prefix %{expand:%%global py3_prefix %(%{__python3} -c "import sys; print(sys.prefix)" 2>/dev/null || echo ERROR)}%py3_prefix -%py3_libdir %{expand:%%global py3_libdir %(%{__python3} -c "import sysconfig; print(sysconfig.get_path('platstdlib'))" 2>/dev/null || echo ERROR)}%py3_libdir %py3_incdir %{expand:%%global py3_incdir %(%{__python3} -c "import sysconfig; print(sysconfig.get_path('include'))" 2>/dev/null || echo ERROR)}%py3_incdir -%py3_sitedir %{expand:%%global py3_sitedir %(%{__python3} -c "import sysconfig; print(sysconfig.get_path('platlib'))" 2>/dev/null || echo ERROR)}%py3_sitedir -%py3_sitescriptdir %{expand:%%global py3_sitescriptdir %(%{__python3} -c "import sysconfig; print(sysconfig.get_path('purelib'))" 2>/dev/null || echo ERROR)}%py3_sitescriptdir -%py3_scriptdir %{py3_prefix}/share/python%{py3_ver} +%py3_libdir %{py3_prefix}/%{_lib}/python%{py3_ver} +%py3_sitedir %{py3_libdir}/site-packages +%py3_sitescriptdir %{py3_prefix}/share/python%{py3_ver}/site-packages %py3_dyndir %{py3_libdir}/lib-dynload # pure python modules compilation -- 2.44.0