packages: rpm-build-macros/rpm.macros - use the sysconfig module to get Pyt...

jajcus jajcus at pld-linux.org
Fri Jul 15 20:07:39 CEST 2011


Author: jajcus                       Date: Fri Jul 15 18:07:39 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use the sysconfig module to get Python3 directories

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.612 -> 1.613) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.612 packages/rpm-build-macros/rpm.macros:1.613
--- packages/rpm-build-macros/rpm.macros:1.612	Fri Jul 15 13:40:50 2011
+++ packages/rpm-build-macros/rpm.macros	Fri Jul 15 20:07:34 2011
@@ -974,11 +974,11 @@
 
 # directories
 %py3_prefix		%{expand:%%global py3_prefix %(%{__python3} -c "import sys; print(sys.prefix)" 2>/dev/null || echo ERROR)}%py3_prefix
-%py3_libdir		%{py3_prefix}/%{_lib}/python%{py3_ver}
+%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_incdir		/usr/include/python%{py3_ver}
-%py3_sitedir		%{py3_libdir}/site-packages
-%py3_sitescriptdir %{py3_scriptdir}/site-packages
 %py3_dyndir		%{py3_libdir}/lib-dynload
 
 # pure python modules compilation
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.612&r2=1.613&f=u



More information about the pld-cvs-commit mailing list