From a3750a16a2c3209304ba287c224f958624281d892e39db49bb0f9bfefc6f9d0e Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Mon, 29 Jul 2024 05:12:52 +0000 Subject: [PATCH] Adapt Conflicts OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=191 --- ...ents-4.15.0+git.1719822011.7a2c0a7f.tar.xz | 4 +- fence-agents.spec | 63 +++++++++++++++++-- 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/fence-agents-4.15.0+git.1719822011.7a2c0a7f.tar.xz b/fence-agents-4.15.0+git.1719822011.7a2c0a7f.tar.xz index 8a36bd2..10aa00a 100644 --- a/fence-agents-4.15.0+git.1719822011.7a2c0a7f.tar.xz +++ b/fence-agents-4.15.0+git.1719822011.7a2c0a7f.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a33002ee6d143c464efe869b0f6324e4711c78e586c3b4f508041af2ec6a686 -size 346212 +oid sha256:7f2799b742c055e0160aebe979107953256e01fd5c88dd60951fc140e818043e +size 619264 diff --git a/fence-agents.spec b/fence-agents.spec index e39cdb1..eac7b20 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -231,6 +231,7 @@ network, storage, or similar. They operate through a unified interface (calling conventions) devised for the original Red Hat clustering solution. %package common +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Common base for Fence Agents Requires: python3-pexpect @@ -290,7 +291,7 @@ Group: System Environment/Base Summary: Fence agent for Alibaba Cloud (Aliyun) Requires: fence-agents-common >= %{version}-%{release} Requires: python3-jmespath >= 0.9.0 -Obsoletes: %{name} < %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} %description aliyun The fence-agents-aliyun package contains a fence agent for Alibaba Cloud (Aliyun) instances. @@ -309,6 +310,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description alom @@ -323,6 +325,7 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Intel AMT devices Requires: amtterm Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description amt @@ -342,6 +345,8 @@ Requires: openwsman-python3 %else Requires: python3-openwsman %endif +Provides: %{name}-amt_ws = %{version}-%{release} +Obsoletes: %{name}-amt_ws < %{version}-%{release} BuildArch: noarch %description amt-ws @@ -359,6 +364,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description apc @@ -377,6 +383,7 @@ Requires: net-snmp-utils %else Requires: net-snmp %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description apc-snmp @@ -394,7 +401,7 @@ Summary: Fence agent for Amazon AWS Requires: fence-agents-common = %{version}-%{release} Requires: python3-boto3 BuildArch: noarch -Obsoletes: fence-agents < %{version} +Conflicts: %{name} < %{version}-%{release} %description aws Fence agent for Amazon AWS instances. @@ -420,7 +427,7 @@ Requires: python311-pexpect Requires: python311-pycurl %endif BuildArch: noarch -Obsoletes: fence-agents < %{version} +Conflicts: %{name} < %{version}-%{release} %description azure-arm Fence agent for Azure Resource Manager instances. @@ -441,6 +448,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description bladecenter @@ -459,6 +467,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description brocade @@ -477,6 +486,7 @@ Requires: net-snmp-utils %else Requires: net-snmp %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description cisco-mds @@ -492,6 +502,7 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Cisco UCS series Requires: fence-agents-common = %{version}-%{release} Requires: python3-pycurl +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description cisco-ucs @@ -509,6 +520,7 @@ Summary: Fence agent for Nova compute nodes Requires: fence-agents-common = %{version}-%{release} Requires: python3-novaclient Requires: python3-requests +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description compute @@ -526,6 +538,7 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Docker Requires: fence-agents-common = %{version}-%{release} Requires: python3-pycurl +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description docker @@ -543,6 +556,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description drac5 @@ -562,6 +576,7 @@ Requires: net-snmp-utils %else Requires: net-snmp %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description eaton-snmp @@ -576,6 +591,7 @@ via the SNMP protocol. License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Eaton network power switches Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description eaton-ssh @@ -590,6 +606,7 @@ via the serial protocol tunnel over SSH. License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Emerson devices (SNMP) Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description emerson @@ -604,6 +621,7 @@ the SNMP protocol. License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for ePowerSwitch 8M+ power switches Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description eps @@ -623,8 +641,8 @@ Requires: python3-google-api-client %else Requires: python3-google-api-python-client %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch -Obsoletes: fence-agents < %{version} %description gce Fence agent for GCE (Google Cloud Engine) instances. @@ -638,6 +656,7 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Hitachi Compute Blade systems Requires: fence-agents-common = %{version}-%{release} Requires: telnet +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description hds-cb @@ -655,6 +674,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description hpblade @@ -674,6 +694,7 @@ Requires: net-snmp-utils %else Requires: net-snmp %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ibmblade @@ -689,6 +710,7 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for IBM z LPARs Requires: fence-agents-common = %{version}-%{release} Requires: python3-requests +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ibmz @@ -703,6 +725,7 @@ Web Services REST API. License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for IBM PowerVS Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ibm-powervs @@ -716,6 +739,7 @@ Fence agent for IBM PowerVS that are accessed via REST API. License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for IBM Cloud VPC Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ibm-vpc @@ -734,6 +758,7 @@ Requires: net-snmp-utils %else Requires: net-snmp %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ifmib @@ -753,6 +778,7 @@ Requires: gnutls-utils %else Requires: gnutls %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ilo2 @@ -773,6 +799,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ilo-moonshot @@ -791,6 +818,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ilo-mp @@ -805,6 +833,7 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agents for HP iLO devices over SSH Requires: fence-agents-common = %{version}-%{release} Requires: openssh-clients +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ilo-ssh @@ -829,6 +858,7 @@ Requires: net-snmp-utils %else Requires: net-snmp %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description intelmodular @@ -848,6 +878,7 @@ Requires: net-snmp-utils %else Requires: net-snmp %endif +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ipdu @@ -863,6 +894,7 @@ License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agents for devices with IPMI interface Requires: /usr/bin/ipmitool Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ipmilan @@ -889,6 +921,7 @@ Fence agents for devices with IPMI interface. License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for OpenStack's Ironic (Bare Metal as a service) Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ironic @@ -902,6 +935,7 @@ Fence agent for OpenStack's Ironic (Bare Metal as a service) service. %package kdump License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for use with kdump crash recovery service +Conflicts: %{name} < %{version}-%{release} Requires: fence-agents-common = %{version}-%{release} # this cannot be noarch since it's compiled @@ -922,6 +956,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description ldom @@ -939,6 +974,7 @@ Requires: openssh-clients Recommends: telnet %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description lpar @@ -957,6 +993,7 @@ Requires: device-mapper-multipath Requires: multipath-tools %endif Requires: fence-agents-common = %{version}-%{release} +Conflicts: %{name} < %{version}-%{release} BuildArch: noarch %description mpath @@ -988,6 +1025,7 @@ via telnet or SSH. %ifarch x86_64 ppc64le %package openstack +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for OpenStack's Nova service Requires: fence-agents-common = %{version}-%{release} @@ -1004,6 +1042,7 @@ Fence agent for OpenStack's Nova service. # skipped from allfenceagents %package pve +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for PVE Requires: fence-agents-common = %{version}-%{release} @@ -1019,6 +1058,7 @@ Fence agent for PVE. # skipped from allfenceagents %package raritan +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Raritan Dominion PX Requires: fence-agents-common = %{version}-%{release} @@ -1033,6 +1073,7 @@ Fence agent for Raritan Dominion PX. # skipped from allfenceagents %package rcd-serial +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for RCD serial Requires: fence-agents-common = %{version}-%{release} @@ -1046,6 +1087,7 @@ Fence agent for RCD serial. %{_mandir}/man8/fence_rcd_serial.8* %package redfish +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: System Environment/Base Summary: Fence agent for Redfish @@ -1062,6 +1104,7 @@ The fence-agents-redfish package contains a fence agent for Redfish %{_mandir}/man8/fence_redfish.8* %package rhevm +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for RHEV-M Requires: fence-agents-common = %{version}-%{release} @@ -1075,6 +1118,7 @@ Fence agent for RHEV-M via REST API. %{_mandir}/man8/fence_rhevm.8* %package rsa +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for IBM RSA II Requires: openssh-clients @@ -1093,6 +1137,7 @@ via telnet or SSH. %{_mandir}/man8/fence_rsa.8* %package rsb +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Fujitsu RSB Requires: openssh-clients @@ -1111,6 +1156,7 @@ via telnet or SSH. %{_mandir}/man8/fence_rsb.8* %package sanbox2 +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for QLogic SANBox2 FC switches Requires: fence-agents-common = %{version}-%{release} @@ -1125,6 +1171,7 @@ Fence agent for QLogic SANBox2 switches that are accessed via telnet. %{_mandir}/man8/fence_sanbox2.8* %package sbd +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for SBD (storage-based death) Requires: fence-agents-common = %{version}-%{release} @@ -1139,6 +1186,7 @@ Fence agent for SBD (storage-based death). %{_mandir}/man8/fence_sbd.8* %package scsi +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for SCSI persistent reservations Requires: fence-agents-common = %{version}-%{release} @@ -1155,6 +1203,7 @@ Fence agent for SCSI persistent reservations. %{_mandir}/man8/fence_scsi.8* %package vbox +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for VirtualBox Requires: fence-agents-common = %{version}-%{release} @@ -1170,6 +1219,7 @@ Fence agent for VirtualBox dom0 accessed via SSH. # skipped from allfenceagents %package virsh +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for virtual machines based on libvirt Requires: /usr/bin/virsh @@ -1185,6 +1235,7 @@ Fence agent for virtual machines that are accessed via SSH. %{_mandir}/man8/fence_virsh.8* %package vmware +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for VMWare with VI Perl Toolkit or vmrun Requires: fence-agents-common = %{version}-%{release} @@ -1199,6 +1250,7 @@ Fence agent for VMWare accessed with VI Perl Toolkit or vmrun. %{_mandir}/man8/fence_vmware.8* %package vmware-rest +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for VMWare with REST API Requires: fence-agents-common = %{version}-%{release} @@ -1213,6 +1265,7 @@ Fence agent for VMWare with REST API. %{_mandir}/man8/fence_vmware_rest.8* %package wti +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for WTI Network power switches Requires: openssh-clients @@ -1231,6 +1284,7 @@ via telnet or SSH. %{_mandir}/man8/fence_wti.8* %package xenapi +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for Citrix XenServer over XenAPI Requires: fence-agents-common = %{version}-%{release} @@ -1249,6 +1303,7 @@ Fence agent for Citrix XenServer accessed over XenAPI. %{_mandir}/man8/fence_xenapi.8* %package zvm +Conflicts: %{name} < %{version}-%{release} License: GPL-2.0-or-later AND LGPL-2.0-or-later Summary: Fence agent for IBM z/VM over IP Requires: fence-agents-common = %{version}-%{release}