From 2cd1b709fddee2184ea09f49abb350132962c17f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 28 2020 09:32:03 +0000 Subject: import resource-agents-sap-hana-scaleout-0.163.2-6.el8 --- diff --git a/SPECS/resource-agents-sap-hana-scaleout.spec b/SPECS/resource-agents-sap-hana-scaleout.spec index 922e6ec..19f268d 100644 --- a/SPECS/resource-agents-sap-hana-scaleout.spec +++ b/SPECS/resource-agents-sap-hana-scaleout.spec @@ -29,7 +29,7 @@ Name: resource-agents-sap-hana-scaleout Summary: SAP HANA Scale-Out cluster resource agents Epoch: 1 Version: 0.163.2 -Release: 5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ URL: https://github.com/SUSE/SAPHanaSR-ScaleOut %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -43,15 +43,16 @@ Patch0: SAPHanaSR-monitor-fix-tolower-error.patch BuildArch: noarch -BuildRequires: automake autoconf gcc -BuildRequires: perl-interpreter python3-devel -BuildRequires: libxslt glib2-devel +BuildRequires: automake autoconf gcc +BuildRequires: perl-interpreter python3-devel +BuildRequires: libxslt glib2-devel %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} BuildRequires: docbook-style-xsl docbook-dtds %endif Requires: resource-agents >= 4.1.1 +Conflicts: resource-agents-sap-hana Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk Requires: perl @@ -63,7 +64,7 @@ environment. %prep %setup -q -n %{upstream_prefix}-%{upstream_version} -%setup -T -D -a 1 -n %{upstream_prefix}-%{upstream_version} +%setup -q -T -D -a 1 -n %{upstream_prefix}-%{upstream_version} %patch0 -p1 @@ -149,6 +150,11 @@ rm -rf %{buildroot} %exclude /usr/src %changelog +* Tue Feb 18 2020 Oyvind Albrigtsen - 0.163.2-6 +- Add Conflicts: to avoid future CI gating errors + + Resolves: rhbz#1802995 + * Thu Jun 27 2019 Oyvind Albrigtsen - 0.163.2-5 - Initial build as separate package