[PATCH 1 of 2] contrib: update build defaults to latest Python and docutils versions
Mads Kiilerich
mads at kiilerich.com
Sun Nov 2 09:42:33 CST 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1414942742 -3600
# Sun Nov 02 16:39:02 2014 +0100
# Branch stable
# Node ID 11d7195f8112e1fba3fe1f1a65924528c21170c1
# Parent cc1cbb0bba8ed1d95c8f1b8e27d4d2893e0dcca7
contrib: update build defaults to latest Python and docutils versions
Use Python 2.7.8 and Docutils 0.12 for Makefile.python and buildrpm (CentOS 5
rpms).
diff --git a/contrib/Makefile.python b/contrib/Makefile.python
--- a/contrib/Makefile.python
+++ b/contrib/Makefile.python
@@ -1,4 +1,4 @@
-PYTHONVER=2.7.6
+PYTHONVER=2.7.8
PYTHONNAME=python-
PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER)
SYMLINKDIR=$(HOME)/bin
@@ -27,7 +27,7 @@ help:
# debian: apt-get install zlib1g-dev libbz2-dev libssl-dev
@echo
@echo 'To build a nice collection of interesting Python versions:'
- @echo ' $$ for v in 2.{4{,.2,.3},5{,.6},6{,.1,.2,.9},7{,.6}}; do'
+ @echo ' $$ for v in 2.{4{,.2,.3},5{,.6},6{,.1,.2,.9},7{,.8}}; do'
@echo ' make -f Makefile.python symlink PYTHONVER=$$v || break; done'
@echo 'To run a Mercurial test on all these Python versions:'
@echo ' $$ for py in `cd ~/bin && ls $(PYTHONNAME)2.*`; do'
@@ -60,7 +60,7 @@ PYTHON_SRCFILE=$(PYTHON_SRCDIR).tgz
printf 'import sys, zlib, bz2\nif sys.version_info >= (2,6):\n import ssl' | $(PREFIX)/bin/python
rm -rf $(PYTHON_SRCDIR)
-DOCUTILSVER=0.11
+DOCUTILSVER=0.12
DOCUTILS_SRCDIR=docutils-$(DOCUTILSVER)
DOCUTILS_SRCFILE=$(DOCUTILS_SRCDIR).tar.gz
diff --git a/contrib/mercurial.spec b/contrib/mercurial.spec
--- a/contrib/mercurial.spec
+++ b/contrib/mercurial.spec
@@ -6,7 +6,7 @@
%global pythonver %{withpython}
%global pythonname Python-%{withpython}
-%global docutilsname docutils-0.11
+%global docutilsname docutils-0.12
%global pythonhg python-hg
%global hgpyprefix /usr/%{pythonhg}
# byte compilation will fail on some some Python /test/ files
More information about the Mercurial-devel
mailing list