From 2f1aaac5ad703ca9388b1ed12be8d2b8c09fd295 Mon Sep 17 00:00:00 2001 From: slin14 Date: Wed, 15 Aug 2018 04:55:09 +0800 Subject: [PATCH] rebase sanlock patch to CentOS7.5 Story: 2003389 Task: 24488 Change-Id: I57d25d6b2c63d8711eba4e8bfd893ec7350090ad Signed-off-by: slin14 --- ...0001-Update-package-versioning-for-TIS-format.patch | 10 +++++----- base/sanlock/centos/srpm_path | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/sanlock/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/sanlock/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index cd238e69f..bb5478df0 100644 --- a/base/sanlock/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/sanlock/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,7 +1,7 @@ -From 112dfdc394a779a860c79c067d47142dc1db2484 Mon Sep 17 00:00:00 2001 +From b37781fdf5c5f4b373f124875c39ae10697c5898 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 16:45:32 -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/sanlock.spec @@ -10,18 +10,18 @@ Conflicts: 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/sanlock.spec b/SPECS/sanlock.spec -index b4996de..ebce8c1 100644 +index 5bfb8e4..587fcb2 100644 --- a/SPECS/sanlock.spec +++ b/SPECS/sanlock.spec @@ -6,7 +6,7 @@ Name: sanlock - Version: 3.5.0 + Version: 3.6.0 -Release: 1%{?dist} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} Summary: A shared storage lock manager Group: System Environment/Base -- -1.9.1 +2.7.4 diff --git a/base/sanlock/centos/srpm_path b/base/sanlock/centos/srpm_path index 6e5198571..1945e74a4 100644 --- a/base/sanlock/centos/srpm_path +++ b/base/sanlock/centos/srpm_path @@ -1,2 +1,2 @@ -mirror:Source/sanlock-3.5.0-1.el7.src.rpm +mirror:Source/sanlock-3.6.0-1.el7.src.rpm