From 38837de645e18dbb502e94c7986a731cfecb5caf Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 7 Nov 2017 06:35:18 -0800 Subject: [PATCH] Cleanup spec file conditionals --- fence-agents.spec | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/fence-agents.spec b/fence-agents.spec index 19e305f..9625c7a 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -16,7 +16,7 @@ Name: fence-agents Summary: Fence Agents for Red Hat Cluster Version: 4.0.24 -Release: 12%{?alphatag:.%{alphatag}}%{?dist} +Release: 13%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base URL: http://sourceware.org/cluster/wiki/ @@ -25,7 +25,7 @@ Patch0: python3.patch Patch1: bz1473908-fix-pexpect-encoding.patch Patch2: fence_zvm-fix-uintptr_t-undeclared.patch -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %global testagents zvm virsh raritan rcd_serial %global allfenceagents fence-agents-alom fence-agents-amt fence-agents-amt-ws fence-agents-apc fence-agents-apc-snmp fence-agents-bladecenter fence-agents-brocade fence-agents-cisco-mds fence-agents-cisco-ucs fence-agents-compute fence-agents-docker fence-agents-drac fence-agents-drac5 fence-agents-eaton-snmp fence-agents-emerson fence-agents-eps fence-agents-hds-cb fence-agents-hpblade fence-agents-ibmblade fence-agents-ifmib fence-agents-ilo2 fence-agents-ilo-mp fence-agents-ilo-ssh fence-agents-ilo-moonshot fence-agents-mpath fence-agents-intelmodular fence-agents-ipdu fence-agents-ipmilan fence-agents-kdump fence-agents-ldom fence-agents-lpar fence-agents-netio fence-agents-ovh fence-agents-rhevm fence-agents-rsa fence-agents-rsb fence-agents-sanbox2 fence-agents-sbd fence-agents-scsi fence-agents-vbox fence-agents-vmware fence-agents-vmware-soap fence-agents-wti fence-agents-xenapi fence-agents-zvm %endif @@ -104,7 +104,7 @@ Obsoletes: fence-agents < 3.1.13 Red Hat Fence Agents is a collection of all supported fence agents. %files all -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package alom License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -251,7 +251,7 @@ The fence-agents-docker package contains a fence agent for Docker images that ar %{_sbindir}/fence_docker %{_mandir}/man8/fence_docker.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package drac License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -329,7 +329,7 @@ The fence-agents-hpblade package contains a fence agent for HP BladeSystem devic %{_sbindir}/fence_hpblade %{_mandir}/man8/fence_hpblade.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package hds-cb License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -489,7 +489,7 @@ The fence-agents-kdump package contains a fence agent for use with kdump crash r %{_mandir}/man8/fence_kdump.8* %{_mandir}/man8/fence_kdump_send.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package ldom License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -504,7 +504,7 @@ The fence-agents-ldom package contains a fence agent for APC devices that are ac %{_mandir}/man8/fence_ldom.8* %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package lpar License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -532,7 +532,7 @@ The fence-agents-mpath package contains fence agent for SCSI persisent reservati %{_sbindir}/fence_mpath %{_mandir}/man8/fence_mpath.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package netio License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -547,7 +547,7 @@ The fence-agents-netio package contains a fence agent for Koukaam NETIO devices %{_mandir}/man8/fence_netio.8* %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package ovh License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -562,7 +562,7 @@ Red Hat Fence Agent for OVH hosting provider %{_mandir}/man8/fence_ovh.8* %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package pve License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -612,7 +612,7 @@ The fence-agents-rhevm package contains a fence agent for RHEV-M via REST API %{_sbindir}/fence_rhevm %{_mandir}/man8/fence_rhevm.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package rsa License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -640,7 +640,7 @@ The fence-agents-rsb package contains a fence agent for Fujitsu RSB devices that %{_sbindir}/fence_rsb %{_mandir}/man8/fence_rsb.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package sanbox2 License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -655,7 +655,7 @@ The fence-agents-sanbox2 package contains a fence agent for QLogic SANBox2 switc %{_mandir}/man8/fence_sanbox2.8* %endif -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package sbd License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -684,7 +684,7 @@ The fence-agents-scsi package contains fence agent for SCSI persisent reservatio %{_datadir}/cluster/fence_scsi_check_hardreboot %{_mandir}/man8/fence_scsi.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package vbox License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -712,7 +712,7 @@ The fence-agents-virsh package contains a fence agent for virtual machines that %{_sbindir}/fence_virsh %{_mandir}/man8/fence_virsh.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package vmware License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -753,7 +753,7 @@ The fence-agents-wti package contains a fence agent for WTI network power switch %{_sbindir}/fence_wti %{_mandir}/man8/fence_wti.8* -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} > 7 %package xenapi License: GPLv2+ and LGPLv2+ Group: System Environment/Base @@ -781,6 +781,9 @@ The fence-agents-zvm package contains a fence agent for IBM z/VM over IP. %{_mandir}/man8/fence_zvmip.8* %changelog +* Tue Nov 07 2017 Troy Dawson - 4.0.24-13 +- Cleanup spec file conditionals + * Tue Aug 29 2017 Oyvind Albrigtsen - 4.0.24-12 - fence-agents-common: remove fence_scsi_check files - fence-scsi: add "fence_scsi_check_hardreboot"