fix cluster-resource-agent srpm build failure after merge sync with master

Story: 2003389
Task: 26564

It is due to 1 more patch added in master, and it conflict with branch change.

Change-Id: I3c5f6afc2c2acdeda7e721400ec1fa68b02b734f
Signed-off-by: slin14 <shuicheng.lin@intel.com>

base/cluster-resource-agents/centos/meta_patches/ipaddr2-avoid-failing-svc-if-down-meta.patch

@@ -1,32 +1,32 @@
-From a8fc00f7d84327284643f70638da2201327bdd10 Mon Sep 17 00:00:00 2001
+From 72bfa2ad793df8fc68b3b6abe87bd7bfbaf99fb1 Mon Sep 17 00:00:00 2001
 From: Bin Qian <bin.qian@windriver.com>
 Date: Wed, 29 Aug 2018 11:22:32 -0400
-Subject: [PATCH 1/1] ipaddr2 avoid failing when svc i/f down
+Subject: [PATCH] ipaddr2 avoid failing when svc i/f down
 
 ---
  SPECS/resource-agents.spec | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
-index aa06c49..0eca09f 100644
+index 520d9c3..959f4db 100644
 --- a/SPECS/resource-agents.spec
 +++ b/SPECS/resource-agents.spec
-@@ -257,6 +257,7 @@ Patch1118: ipaddr2_if_down.patch
+@@ -283,6 +283,7 @@ Patch1117: lvm_cleanup_refs_on_stop.patch
+ Patch1118: ipaddr2_if_down.patch
  Patch1119: ipaddr2_ignore_lo_if_state.patch
- Patch1120: Modify-error-code-of-bz1454699-fix-to-prevent-inactive-controller-reboot-loop.patch
+ Patch1120: Re-enable-background-execution-of-arp-commands.patch
- Patch1121: Re-enable-background-execution-of-arp-commands.patch
++Patch1121: ipaddr2-avoid-failing-svc-if-down.patch
-+Patch1122: ipaddr2-avoid-failing-svc-if-down.patch
  
  Obsoletes:	heartbeat-resources <= %{version}
  Provides:	heartbeat-resources = %{version}
-@@ -568,6 +569,7 @@ exit 1
+@@ -620,6 +621,7 @@ exit 1
+ %patch1118 -p1
  %patch1119 -p1
  %patch1120 -p1
- %patch1121 -p1
++%patch1121 -p1
-+%patch1122 -p1
  
  %build
  if [ ! -f configure ]; then
 -- 
-1.8.3.1
+2.7.4
 

base/cluster-resource-agents/centos/meta_patches/spec-include-TiS-patches.patch

@@ -1,19 +1,19 @@
-From 8d7740777cbbcdfa00f3e12b7e292aca2b696137 Mon Sep 17 00:00:00 2001
+From 1f6128eb7bf5287db6def45f278acf771a711a42 Mon Sep 17 00:00:00 2001
 From: Scott Little <scott.little@windriver.com>
 Date: Mon, 2 Oct 2017 15:11:58 -0400
-Subject: [PATCH 01/10] WRS: spec-include-TiS-patches.patch
+Subject: [PATCH] WRS: spec-include-TiS-patches.patch
 
 ---
  SPECS/resource-agents.spec | 20 ++++++++++++++++++++
  1 file changed, 20 insertions(+)
 
 diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
-index db6b69c..453398a 100644
+index a16660a..6c1ec89 100644
 --- a/SPECS/resource-agents.spec
 +++ b/SPECS/resource-agents.spec
-@@ -236,6 +236,16 @@ Patch175:	bz1449681-2-saphana-saphanatopology-update-0.152.21.patch
+@@ -263,6 +263,16 @@ Patch202:	bz1536548-sap_redhat_cluster_connector-fix-unknown-gvi-function.patch
- Patch176:	bz1342376-2-rabbitmq-cluster-backup-and-restore-users-policies.patch
+ Patch203:	bz1543366-redis-add-support-for-tunneling-replication-traffic.patch
- Patch177:	bz1342376-3-rabbitmq-cluster-backup-and-restore-users-policies.patch
+ Patch204:	bz1546083-galera-fix-temp-logfile-rights.patch
  
 +# WRS
 +Patch1105:  filesystem_rmon.patch
@@ -28,9 +28,9 @@ index db6b69c..453398a 100644
  Obsoletes:	heartbeat-resources <= %{version}
  Provides:	heartbeat-resources = %{version}
  
-@@ -528,6 +538,16 @@ exit 1
+@@ -582,6 +592,16 @@ exit 1
- %patch176 -p1
+ %patch203 -p1
- %patch177 -p1
+ %patch204 -p1
  
 +# WRS
 +%patch1105 -p1
@@ -46,5 +46,5 @@ index db6b69c..453398a 100644
  if [ ! -f configure ]; then
  	./autogen.sh
 -- 
-1.9.1
+2.7.4