From 3fd67fcd8932dc6f3a3eaaddefd10d6eb3dad566 Mon Sep 17 00:00:00 2001 From: slin14 Date: Fri, 10 Aug 2018 23:32:00 +0800 Subject: [PATCH] rebase python patch to CentOS7.5 Story: 2003389 Task: 24465 Change-Id: I4411dd1e617b3f8a2f99543e0c073236c58a29f2 Signed-off-by: slin14 --- ...01-Update-package-versioning-for-TIS-format.patch | 12 ++++++------ python/python-2.7.5/centos/srpm_path | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) 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 a74821216..d30960d23 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 @@ -1,25 +1,25 @@ -From e9bc5d92bb0ee327015626072fee83f12018712c Mon Sep 17 00:00:00 2001 +From 61ff7bbc259e5729f58536bdb6e3a554de6be514 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Tue, 27 Mar 2018 12:38:50 -0500 -Subject: [PATCH] Update package versioning for TIS format +Subject: [PATCH 1/4] Update package versioning for TIS format --- SPECS/python.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/python.spec b/SPECS/python.spec -index a9fd32f..62f21d4 100644 +index 2af363e..c3706be 100644 --- a/SPECS/python.spec +++ b/SPECS/python.spec @@ -106,7 +106,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: 58%{?dist} -+Release: 58.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 69%{?dist} ++Release: 69.el7_5%{?_tis_dist}.%{tis_patch_ver} License: Python Group: Development/Languages Requires: %{python}-libs%{?_isa} = %{version}-%{release} -- -1.8.3.1 +2.7.4 diff --git a/python/python-2.7.5/centos/srpm_path b/python/python-2.7.5/centos/srpm_path index 6b069fded..d6afcb06f 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-58.el7.src.rpm +mirror:Source/python-2.7.5-69.el7_5.src.rpm