dad45a06a5
stx-integ/base/cluster-resource-agents Move content from stx-gplv2 into stx-integ Packages will be relocated to stx-integ: base/ bash cgcs-users cluster-resource-agents dpkg haproxy libfdt netpbm rpm database/ mariadb filesystem/ iscsi-initiator-utils filesystem/drbd/ drbd-tools kernel/kernel-modules/ drbd integrity intel-e1000e intel-i40e intel-i40evf intel-ixgbe intel-ixgbevf qat17 tpmdd ldap/ ldapscripts networking/ iptables net-tools Change-Id: I3a4ee4bde0adfd2a486bd5be3a151db85aa4947e Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
29 lines
872 B
Diff
29 lines
872 B
Diff
From 2bc73669b8de70bf32d2f786b158738506e480ff Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Mon, 2 Oct 2017 15:11:59 -0400
|
|
Subject: [PATCH 08/10] WRS:
|
|
0001-Update-package-versioning-for-TIS-format.patch
|
|
|
|
Conflicts:
|
|
SPECS/resource-agents.spec
|
|
---
|
|
SPECS/resource-agents.spec | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
|
|
index 6be3418..28a8129 100644
|
|
--- a/SPECS/resource-agents.spec
|
|
+++ b/SPECS/resource-agents.spec
|
|
@@ -48,7 +48,7 @@
|
|
Name: resource-agents
|
|
Summary: Open Source HA Reusable Cluster Resource Scripts
|
|
Version: 3.9.5
|
|
-Release: 105%{?dist}
|
|
+Release: 105.el7%{?_tis_dist}.%{tis_patch_ver}
|
|
License: GPLv2+, LGPLv2+ and ASL 2.0
|
|
URL: https://github.com/ClusterLabs/resource-agents
|
|
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
|
|
--
|
|
1.9.1
|
|
|