Patchwork buildrpm: bump bundled Python version to 2.7.16 when building for centos{5, 6}

login
register
mail settings
Submitter via Mercurial-devel
Date April 19, 2019, 12:42 a.m.
Message ID <76724fb64a22ca2c68e1.1555634570@cuben.lan>
Download mbox | patch
Permalink /patch/39756/
State Accepted
Headers show

Comments

via Mercurial-devel - April 19, 2019, 12:42 a.m.
# HG changeset patch
# User Antonio Muci <a.mux@inwind.it>
# Date 1555633465 -7200
#      Fri Apr 19 02:24:25 2019 +0200
# Branch stable
# Node ID 76724fb64a22ca2c68e165e71914827601339300
# Parent  84b5ad5fc2aa81d114d0c8ff869367104e997dd3
buildrpm: bump bundled Python version to 2.7.16 when building for centos{5,6}

When building rpm packages for centos 5 and 6, we bundle a mercurial-specific
version of Python 2.7 in /opt/python-hg.

This change is analogous to 5e947367606c, and bumps the embedded Python version
from 2.7.14 (released in 2017) to 2.7.16 (latest as of today).
Gregory Szorc - April 25, 2019, 2:07 a.m.
On Thu, Apr 18, 2019 at 5:53 PM Antonio Muci via Mercurial-devel <
mercurial-devel@mercurial-scm.org> wrote:

> # HG changeset patch
> # User Antonio Muci <a.mux@inwind.it>
> # Date 1555633465 -7200
> #      Fri Apr 19 02:24:25 2019 +0200
> # Branch stable
> # Node ID 76724fb64a22ca2c68e165e71914827601339300
> # Parent  84b5ad5fc2aa81d114d0c8ff869367104e997dd3
> buildrpm: bump bundled Python version to 2.7.16 when building for
> centos{5,6}
>

Queued for stable. Thank you for the packaging enhancement!


>
> When building rpm packages for centos 5 and 6, we bundle a
> mercurial-specific
> version of Python 2.7 in /opt/python-hg.
>
> This change is analogous to 5e947367606c, and bumps the embedded Python
> version
> from 2.7.14 (released in 2017) to 2.7.16 (latest as of today).
>
> 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.14
> +PYTHONVER=2.7.16
>  PYTHONNAME=python-
>  PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER)
>  SYMLINKDIR=$(HOME)/bin
> diff --git a/contrib/packaging/buildrpm b/contrib/packaging/buildrpm
> --- a/contrib/packaging/buildrpm
> +++ b/contrib/packaging/buildrpm
> @@ -20,8 +20,8 @@ while [ "$1" ]; do
>          ;;
>      --withpython | --with-python)
>          shift
> -        PYTHONVER=2.7.14
> -        PYTHONMD5=cee2e4b33ad3750da77b2e85f2f8b724
> +        PYTHONVER=2.7.16
> +        PYTHONMD5=f1a2ace631068444831d01485466ece0
>          ;;
>      --rpmbuilddir )
>          shift
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

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.14
+PYTHONVER=2.7.16
 PYTHONNAME=python-
 PREFIX=$(HOME)/bin/prefix-$(PYTHONNAME)$(PYTHONVER)
 SYMLINKDIR=$(HOME)/bin
diff --git a/contrib/packaging/buildrpm b/contrib/packaging/buildrpm
--- a/contrib/packaging/buildrpm
+++ b/contrib/packaging/buildrpm
@@ -20,8 +20,8 @@  while [ "$1" ]; do
         ;;
     --withpython | --with-python)
         shift
-        PYTHONVER=2.7.14
-        PYTHONMD5=cee2e4b33ad3750da77b2e85f2f8b724
+        PYTHONVER=2.7.16
+        PYTHONMD5=f1a2ace631068444831d01485466ece0
         ;;
     --rpmbuilddir )
         shift