From 0d7d726ebf1143d1f5ad6fa744d027317925930f Mon Sep 17 00:00:00 2001 From: slin14 Date: Mon, 13 Aug 2018 23:57:45 +0800 Subject: [PATCH] rebase util-linux patch to CentOS7.5 Story: 2003389 Task: 24470 Change-Id: Ia1fad46d86d4cecca2a691dfe3a6175f840179ce Signed-off-by: slin14 --- ...01-Update-package-versioning-for-TIS-format.patch | 12 ++++++------ base/util-linux/centos/srpm_path | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/util-linux/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/util-linux/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 68db6d0a3..0bad3184f 100644 --- a/base/util-linux/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/util-linux/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,7 +1,7 @@ -From e665a4b1693745e5c97c14c473e531883225df12 Mon Sep 17 00:00:00 2001 +From 9ca3c8b4c62532cfbcdf5b9bf1c24a5a53e4f619 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 14:55:36 -0400 -Subject: [PATCH 3/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch +Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch Conflicts: SPECS/util-linux.spec @@ -10,18 +10,18 @@ Conflicts: 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/util-linux.spec b/SPECS/util-linux.spec -index bed4869..2388f6a 100644 +index 537a03c..3897c16 100644 --- a/SPECS/util-linux.spec +++ b/SPECS/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.23.2 --Release: 43%{?dist} -+Release: 43.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 52%{?dist} ++Release: 52.el7%{?_tis_dist}.%{tis_patch_ver} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux -- -1.9.1 +2.7.4 diff --git a/base/util-linux/centos/srpm_path b/base/util-linux/centos/srpm_path index 1099936c4..4251ec851 100644 --- a/base/util-linux/centos/srpm_path +++ b/base/util-linux/centos/srpm_path @@ -1 +1 @@ -mirror:Source/util-linux-2.23.2-43.el7.src.rpm +mirror:Source/util-linux-2.23.2-52.el7.src.rpm