aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-08-04 07:58:24 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-08-04 08:04:30 -0400
commit08bbcec4a6473dfae2650fa5854aa5731a4cde72 (patch)
tree528f5a93f015796c12faa6cdde2c644a99f9ae73
parenta67df11f44ce3322c8ab6d9dc4b7a95b2143e02d (diff)
downloadrpm-setup-08bbcec4a6473dfae2650fa5854aa5731a4cde72.tar
rpm-setup-08bbcec4a6473dfae2650fa5854aa5731a4cde72.tar.gz
rpm-setup-08bbcec4a6473dfae2650fa5854aa5731a4cde72.tar.bz2
rpm-setup-08bbcec4a6473dfae2650fa5854aa5731a4cde72.tar.xz
rpm-setup-08bbcec4a6473dfae2650fa5854aa5731a4cde72.zip
kill python_(version|sitelib|sitearch) macros
they are already defined in rpm...
-rw-r--r--NEWS2
-rw-r--r--build.macros.in10
2 files changed, 2 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 85304e7..04070ef 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- kill python macros that are already defined in rpm
+
Version 2.12 - 7 July 2015, by Christiaan Welvaart
- do not add -fPIC to optflags for x86-64
diff --git a/build.macros.in b/build.macros.in
index 3e542e5..564fb57 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -392,21 +392,11 @@ Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
#------------------------------------------------------------------------------
# Python specific macros
-# (from rpm 4.4.6)
-%python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
-%python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-%python_version %(%{__python} -c "import sys; print(sys.version[0:3])")
-
# More Python specific macro definitions (originally from PLD).
#
-%py_ver %(python -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)
-%py_prefix %(python -c "import sys; print sys.prefix" 2>/dev/null || echo PYTHON-NOT-FOUND)
# backward compatibility
-%py_libdir %py_purelibdir
%py_platlibdir %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
%py_purelibdir %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=0)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
-%py_incdir %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()' 2>/dev/null || echo PYTHON-INCLUDEDIR-NOT-FOUND)
-%py_sitedir %py_puresitedir
%py_platsitedir %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
%py_puresitedir %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)