From 7d4fec17ef8c39e1f86db9c4854426b29926f75e Mon Sep 17 00:00:00 2001 From: AngelaBriel Date: Thu, 6 Apr 2023 18:07:30 +0200 Subject: [PATCH] change package spec, let SAPHanaSR-angi conflict with SAPHanaSR and SAPHanaSR-ScaleOut --- SAPHanaSR-angi.changes | 5 ++--- SAPHanaSR-angi.spec | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/SAPHanaSR-angi.changes b/SAPHanaSR-angi.changes index 2b4cdcab..b010dadb 100644 --- a/SAPHanaSR-angi.changes +++ b/SAPHanaSR-angi.changes @@ -1,12 +1,11 @@ ------------------------------------------------------------------- -Wed Mar 29 07:49:16 UTC 2023 - abriel@suse.com +Thu Apr 6 09:32:36 UTC 2023 - abriel@suse.com - Version bump to 1.001.4 - * Rename package to SAPHanaSR-angi + * New package SAPHanaSR-angi SAP HANA System Replication - A New Generation Interface * support SAPHana ScaleUp and ScaleOut environments with one set of resource agents - * To be continued ------------------------------------------------------------------- Tue Jan 24 15:27:27 UTC 2023 - abriel@suse.com diff --git a/SAPHanaSR-angi.spec b/SAPHanaSR-angi.spec index c095a611..fae2fded 100644 --- a/SAPHanaSR-angi.spec +++ b/SAPHanaSR-angi.spec @@ -25,6 +25,7 @@ Version: 1.001.4 Release: 0 Url: https://www.suse.com/c/fail-safe-operation-of-sap-hana-suse-extends-its-high-availability-solution/ +Conflicts: SAPHanaSR SAPHanaSR-ScaleOut BuildArch: noarch Source0: %{name}-%{version}.tgz @@ -114,10 +115,6 @@ install -m 0555 tools/SAPHanaSR-hookHelper %{buildroot}/usr/bin install -m 0555 tools/SAPHanaSR-manageProvider %{buildroot}/usr/bin install -m 0444 tools/SAPHanaSRTools.pm %{buildroot}/usr/lib/%{name} -# README and LICENSE -#install -m 0444 LICENSE %{buildroot}%{_docdir}/%{name} -#install -m 0444 README.md %{buildroot}%{_docdir}/%{name}/README - # wizard files for hawk2 install -D -m 0644 wizard/hawk2/saphanasr.yaml %{buildroot}%{crmscr_path}/saphanasr/main.yml install -D -m 0644 wizard/hawk2/saphanasr_su_po.yaml %{buildroot}%{crmscr_path}/saphanasr-su-po/main.yml