From fb8e22e3db7ee0e36638cc54a4deba9813a77825 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 18 Mar 2025 07:47:17 +0000
Subject: [PATCH] import CS sap-cluster-connector-3.0.1-10.el9_5
---
.gitignore | 2 +-
.sap-cluster-connector.metadata | 2 +-
SPECS/sap-cluster-connector.spec | 48 +++++++++++++++++++++-----------
3 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/.gitignore b/.gitignore
index ae92dc5..fbd1cdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/sap_cluster_connector-42d6ce2.tar.gz
+SOURCES/sap_cluster_connector-ba8c22e.tar.gz
diff --git a/.sap-cluster-connector.metadata b/.sap-cluster-connector.metadata
index ac81214..8c9368c 100644
--- a/.sap-cluster-connector.metadata
+++ b/.sap-cluster-connector.metadata
@@ -1 +1 @@
-3806780db10228227b87cf4c425cddc2baacfd89 SOURCES/sap_cluster_connector-42d6ce2.tar.gz
+1de13301ee05b407e15d0c249ed8a8c124b884f9 SOURCES/sap_cluster_connector-ba8c22e.tar.gz
diff --git a/SPECS/sap-cluster-connector.spec b/SPECS/sap-cluster-connector.spec
index 4e74307..28c2778 100644
--- a/SPECS/sap-cluster-connector.spec
+++ b/SPECS/sap-cluster-connector.spec
@@ -20,25 +20,27 @@
#
%global sap_script_prefix sap_cluster_connector
-%global sap_script_hash 42d6ce2
+%global sap_script_hash ba8c22e
-Name: sap-cluster-connector
-Summary: SAP cluster connector script
-Version: 3.0.1
-Release: 7%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
-License: GPLv2+
-URL: https://github.com/fdanapfel/sap_cluster_connector
+Name: sap-cluster-connector
+Summary: SAP cluster connector script
+Version: 3.0.1
+Release: 10%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+License: GPLv2+
+URL: https://github.com/redhat-sap/sap_cluster_connector
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
-Group: System Environment/Base
+Group: System Environment/Base
%else
-Group: Productivity/Clustering/HA
+Group: Productivity/Clustering/HA
%endif
-Source0: %{sap_script_prefix}-%{sap_script_hash}.tar.gz
+Source0: %{sap_script_prefix}-%{sap_script_hash}.tar.gz
-BuildArch: noarch
+BuildArch: noarch
-Requires: resource-agents-sap >= 4.8.0
-Requires: perl
+BuildRequires: perl-generators
+
+Requires: resource-agents-sap >= 4.8.0
+Requires: perl-interpreter
%description
The SAP connector script interface with Pacemaker to allow SAP
@@ -54,10 +56,10 @@ rm -rf %{buildroot}
test -d %{buildroot}/%{_bindir} || mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_datadir}/sap_cluster_connector
mkdir -p %{buildroot}/%{_mandir}/man8
-cp redhat/sap_cluster_connector %{buildroot}/%{_bindir}
-cp -rv redhat/{run_checks,checks} %{buildroot}/%{_datadir}/sap_cluster_connector
-gzip redhat/man/*.8
-cp redhat/man/*.8.gz %{buildroot}/%{_mandir}/man8
+cp sap_cluster_connector %{buildroot}/%{_bindir}
+cp -rv {run_checks,checks} %{buildroot}/%{_datadir}/sap_cluster_connector
+gzip man/*.8
+cp man/*.8.gz %{buildroot}/%{_mandir}/man8
%files
%defattr(-,root,root)
@@ -66,6 +68,16 @@ cp redhat/man/*.8.gz %{buildroot}/%{_mandir}/man8
%{_datadir}/sap_cluster_connector
%changelog
+* Thu Feb 20 2025 Janine Fuchs <jfuchs@redhat.com> - 3.0.1-10
+- Fix output parser mismatch since pacemaker 2.1.6.
+
+ Resolves: RHEL-80319
+
+* Thu Dec 12 2024 Janine Fuchs <jfuchs@redhat.com> - 3.0.1-8
+- Changed perl dependency to perl-interpreter
+
+ Resolves: RHEL-60115
+
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.1-7.1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
@@ -84,3 +96,5 @@ cp redhat/man/*.8.gz %{buildroot}/%{_mandir}/man8
- Initial build as separate package
Resolves: rhbz#1688346
+
+# vim:set ai ts=2 sw=2 sts=2 et: