From 2c308d90d5f7fd846cdc2767be8774721c2c6b52 Mon Sep 17 00:00:00 2001
From: Zhe Hu <zhe.hu@intel.com>
Date: Wed, 19 Dec 2018 10:23:32 +0800
Subject: [PATCH] rebase python patch to CentOS 7.6 version

Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/626065

Story: 2004522
Task: 28396

Change-Id: I850651bb4c5ca2e60d4b63434d5f1cfe72d64069
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
---
 python/python-2.7.5/centos/build_srpm.data                  | 2 +-
 .../0001-Update-package-versioning-for-TIS-format.patch     | 6 +++---
 .../meta_patches/0002-Disable-unittest-check-phase.patch    | 2 +-
 .../centos/meta_patches/0003-Make-Python-Faster.patch       | 6 +++---
 .../0004-Turn-off-with_systemtap-to-disable-dtrace.patch    | 2 +-
 python/python-2.7.5/centos/srpm_path                        | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/python/python-2.7.5/centos/build_srpm.data b/python/python-2.7.5/centos/build_srpm.data
index d3f64f336..0eac83bbb 100644
--- a/python/python-2.7.5/centos/build_srpm.data
+++ b/python/python-2.7.5/centos/build_srpm.data
@@ -1 +1 @@
-TIS_PATCH_VER=3
+TIS_PATCH_VER=4
diff --git a/python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
index d30960d23..c9d0cf319 100644
--- a/python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ b/python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
@@ -11,12 +11,12 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec
 index 2af363e..c3706be 100644
 --- a/SPECS/python.spec
 +++ b/SPECS/python.spec
-@@ -106,7 +106,7 @@ Summary: An interpreted, interactive, object-oriented programming language
+@@ -114,7 +114,7 @@ Summary: An interpreted, interactive, object-oriented programming language
  Name: %{python}
  # Remember to also rebase python-docs when changing this:
  Version: 2.7.5
--Release: 69%{?dist}
-+Release: 69.el7_5%{?_tis_dist}.%{tis_patch_ver}
+-Release: 76%{?dist}
++Release: 76.el7%{?_tis_dist}.%{tis_patch_ver}
  License: Python
  Group: Development/Languages
  Requires: %{python}-libs%{?_isa} = %{version}-%{release}
diff --git a/python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch b/python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch
index 04426cede..420c9eee9 100644
--- a/python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch
+++ b/python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch
@@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec
 index a9fd32f..1030c57 100644
 --- a/SPECS/python.spec
 +++ b/SPECS/python.spec
-@@ -54,7 +54,7 @@
+@@ -62,7 +62,7 @@
  %global with_gdbm 1
  
  # Turn this to 0 to turn off the "check" phase:
diff --git a/python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch b/python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch
index f49203739..612f5c9b4 100644
--- a/python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch
+++ b/python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch
@@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec
 index 94adb05..36289ea 100644
 --- a/SPECS/python.spec
 +++ b/SPECS/python.spec
-@@ -1259,6 +1259,8 @@ Patch305: 00305-CVE-2016-2183.patch
+@@ -1301,6 +1301,8 @@ Patch306: 00306-fix-oserror-17-upon-semaphores-creation.patch
  # above:
  Patch5000: 05000-autotool-intermediates.patch
  
@@ -20,7 +20,7 @@ index 94adb05..36289ea 100644
  # ======================================================
  # Additional metadata, and subpackages
  # ======================================================
-@@ -1670,6 +1672,7 @@ find -name "*~" |xargs rm -f
+@@ -1719,6 +1721,7 @@ find -name "*~" |xargs rm -f
  %patch5000 -p0 -b .autotool-intermediates
  %endif
  
@@ -28,7 +28,7 @@ index 94adb05..36289ea 100644
  
  # ======================================================
  # Configuring and building the code:
-@@ -1800,7 +1803,7 @@ BuildPython debug \
+@@ -1849,7 +1852,7 @@ BuildPython debug \
  BuildPython optimized \
    python \
    python%{pybasever} \
diff --git a/python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch b/python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch
index 7c52f7e8a..38c739fa7 100644
--- a/python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch
+++ b/python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch
@@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec
 index 2441951..c2edce8 100644
 --- a/SPECS/python.spec
 +++ b/SPECS/python.spec
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
  
  %global with_gdb_hooks 1
  
diff --git a/python/python-2.7.5/centos/srpm_path b/python/python-2.7.5/centos/srpm_path
index d6afcb06f..4f555512b 100644
--- a/python/python-2.7.5/centos/srpm_path
+++ b/python/python-2.7.5/centos/srpm_path
@@ -1,2 +1,2 @@
-mirror:Source/python-2.7.5-69.el7_5.src.rpm
+mirror:Source/python-2.7.5-76.el7.src.rpm