From 5b35567612ccfcd59c0b668ca5efa5df6b7d4e39 Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Sat, 29 Dec 2018 21:28:49 +0800 Subject: [PATCH] upgrade watchdog to CentOS 7.6 version [Patch 2/3] update to version 5.13-12 Story: 2004522 Task: 28437 Depends-On: https://review.openstack.org/#/c/627759/ Change-Id: I440f8b43e826308cf812e0c40b2e046a11f49e9f Signed-off-by: SidneyAn --- .../0001-Update-package-versioning-for-TIS-format.patch | 6 +++--- base/watchdog/centos/meta_patches/spec-TiS-changes.patch | 4 ++-- base/watchdog/centos/srpm_path | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 4e3359b40..e4b7ad2a6 100644 --- a/base/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/watchdog/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -11,12 +11,12 @@ diff --git a/SPECS/watchdog.spec b/SPECS/watchdog.spec index 75ce3dd..88c4245 100644 --- a/SPECS/watchdog.spec +++ b/SPECS/watchdog.spec -@@ -1,7 +1,7 @@ +@@ -2,7 +2,7 @@ Summary: Software and/or Hardware watchdog daemon Name: watchdog Version: 5.13 --Release: 11%{?dist} -+Release: 11.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 12%{?dist} ++Release: 12.el7%{?_tis_dist}.%{tis_patch_ver} License: GPLv2+ URL: http://sourceforge.net/projects/watchdog/ diff --git a/base/watchdog/centos/meta_patches/spec-TiS-changes.patch b/base/watchdog/centos/meta_patches/spec-TiS-changes.patch index 13f2e7161..fc6f3ac43 100644 --- a/base/watchdog/centos/meta_patches/spec-TiS-changes.patch +++ b/base/watchdog/centos/meta_patches/spec-TiS-changes.patch @@ -14,7 +14,7 @@ diff --git a/SPECS/watchdog.spec b/SPECS/watchdog.spec index 7eeacc9..75ce3dd 100644 --- a/SPECS/watchdog.spec +++ b/SPECS/watchdog.spec -@@ -18,6 +18,7 @@ Patch1: 0001-watchdog-Clearer-help-output.patch +@@ -19,6 +19,7 @@ Patch1: 0001-watchdog-Clearer-help-output.patch Patch2: 0002-wd_identify-wd_keepalive-Document-c-config-file-in-h.patch Patch3: 0003-watchdog-5.13-rhsel.patch Patch4: 0004-watchdog-5.13-rhseldoc.patch @@ -22,7 +22,7 @@ index 7eeacc9..75ce3dd 100644 BuildRequires: systemd-units -@@ -49,6 +50,7 @@ expiration) initiated by the BMC. +@@ -50,6 +51,7 @@ expiration) initiated by the BMC. %patch2 -p1 -b .keepalive %patch3 -p1 -b .rhsel %patch4 -p1 -b .rhseldoc diff --git a/base/watchdog/centos/srpm_path b/base/watchdog/centos/srpm_path index dbfb5a496..58c57a835 100644 --- a/base/watchdog/centos/srpm_path +++ b/base/watchdog/centos/srpm_path @@ -1 +1 @@ -mirror:Source/watchdog-5.13-11.el7.src.rpm +mirror:Source/watchdog-5.13-12.el7.src.rpm