[python] Improve python2_version macros

Matej Stuchlik mstuchli at fedoraproject.org
Mon Nov 24 08:21:24 UTC 2014


commit 7fad94a5912885047df5440c58c4f5ddd9d587cb
Author: Matej Stuchlik <mstuchli at redhat.com>
Date:   Thu Nov 20 12:22:08 2014 +0100

    Improve python2_version macros

 macros.python2 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/macros.python2 b/macros.python2
index d090296..352f241 100644
--- a/macros.python2
+++ b/macros.python2
@@ -1,5 +1,5 @@
 %__python2 /usr/bin/python2
 %python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 %python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
-%python2_version %(%{__python2} -c "import sys; sys.stdout.write(sys.version[:3])")
-%python2_version_nodots %(%{__python2} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))")
+%python2_version %(%{__python2} -c "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))")
+%python2_version_nodots %(%{__python2} -c "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")


More information about the scm-commits mailing list