From a5079d8d830aaf8b1cba740fe563ddbb39888183e240fc07f14e86fdc53db830 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 27 Jan 2016 10:28:56 +0000 Subject: [PATCH] - Package fence_dummy in fence-agents-devel package - Clean up package OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=47 --- fence-agents.changes | 6 ++ fence-agents.spec | 131 ++++++++++--------------------------------- 2 files changed, 35 insertions(+), 102 deletions(-) diff --git a/fence-agents.changes b/fence-agents.changes index b7f2d13..90b631a 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 27 10:27:41 UTC 2016 - kgronlund@suse.com + +- Package fence_dummy in fence-agents-devel package +- Clean up package + ------------------------------------------------------------------- Wed Jan 13 14:06:20 UTC 2016 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index 7f7d452..b0ffc06 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -27,15 +27,10 @@ Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.gz -Requires: python-curl -Requires: python-openssl -Requires: python-pexpect -Requires: python-requests -Requires: python-suds - BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake +BuildRequires: fdupes BuildRequires: glibc-devel BuildRequires: libtool BuildRequires: libxml2-tools @@ -53,20 +48,16 @@ BuildRequires: python-suds BuildRequires: python-xml BuildRequires: xz -%package -n fence-agents-unsupported -Summary: Fence Agents for Pacemaker from RHCS -Group: Productivity/Clustering/HA -Requires: %{name} = %{version}-%{release} -# These are requirements of specific fencing agents; when moving the -# agent over to the supported main package, make sure to also shift the -# Requires if needed Requires: net-snmp Requires: openssh Requires: perl-Net-Telnet +Requires: python-curl +Requires: python-openssl +Requires: python-pexpect +Requires: python-requests +Requires: python-suds Requires: sg3_utils Requires: telnet -# for fence_vmware_soap: -Requires: python-suds # This is required by fence_virsh. Per discussion on fedora-devel # switching from package to file based require. Requires: /usr/bin/virsh @@ -75,83 +66,23 @@ Requires: /usr/bin/virsh # have changed Requires around. Make sure to get the right one. Requires: /usr/bin/ipmitool +%if 0%{?with_regression_tests} +BuildRequires: time +%endif + %description Fence Agents is a collection of scripts to handle remote power management for several devices. +%package devel +Summary: Fence Agents for Pacemaker from RHCS +Group: Development/Tools/Other +Requires: %{name} = %{version} - -Authors: --------- - Abhijith Das - Adam Manthei - A. J. Lewis - Alasdair G. Kergon - Andrew Price - Benjamin Marzinski - Bob Peterson - Chris Feist - Christine Caulfield - Daniel Phillips - David Teigland - Fabio M. Di Nitto - James Parsons - Joel Becker - Jonathan Brassow - jparsons - Ken Preslan - Lon Hohberger - Marc - A. Dahlhaus - Marek 'marx' Grac - Mark Hlawatschek - Michael Conrad Tadpol Tilstra - Patrick Caulfield - Robert Peterson - Ross Vandegrift - Ryan McCabe - Ryan O'Hara - Stanko Kupcevic - Steven Whitehouse - Wendy Cheng - -%description -n fence-agents-unsupported +%description devel Fence Agents is a collection of scripts to handle remote power -management for several devices. - - - -Authors: --------- - Abhijith Das - Adam Manthei - A. J. Lewis - Alasdair G. Kergon - Andrew Price - Benjamin Marzinski - Bob Peterson - Chris Feist - Christine Caulfield - Daniel Phillips - David Teigland - Fabio M. Di Nitto - James Parsons - Joel Becker - Jonathan Brassow - jparsons - Ken Preslan - Lon Hohberger - Marc - A. Dahlhaus - Marek 'marx' Grac - Mark Hlawatschek - Michael Conrad Tadpol Tilstra - Patrick Caulfield - Robert Peterson - Ross Vandegrift - Ryan McCabe - Ryan O'Hara - Stanko Kupcevic - Steven Whitehouse - Wendy Cheng +management for several devices. This package contains +fence agents only suitable for development. %prep %setup -q -n %{name}-%{version} @@ -168,42 +99,38 @@ make install DESTDIR=%{buildroot} ## tree fix up # fix libfence permissions -chmod 0755 %{buildroot}%{_datadir}/fence/*.py +chmod 0755 %{buildroot}%{_datadir}/fence/fenc*.py # remove docs rm -rf %{buildroot}/usr/share/doc/fence-agents # create links to agents in the plugins dir mkdir -p %{buildroot}%{plugin_dir} ln -s %{_sbindir}/fence_cisco_ucs %{buildroot}%{plugin_dir} +%fdupes %buildroot%{_sbindir} +%fdupes %buildroot%{_datadir}/cluster -%clean -if - [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ] -then - rm -rf $RPM_BUILD_ROOT -fi +%if 0%{?with_regression_tests} +%check +make check +PYTHONPATH=fence/agents/lib python fence/agents/lib/tests/test_fencing.py +%endif %files %defattr(-,root,root,-) %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence -#%%dir %%{_sysconfdir}/cluster %dir %{plugin_dir} %dir %{_libdir}/stonith/plugins %dir %{_libdir}/stonith %{_datadir}/fence %{_datadir}/cluster -#%%{_sbindir}/fence_cisco_ucs -#%%{_mandir}/man8/fence_cisco_ucs* %{plugin_dir}/fence_cisco_ucs - -#%%files -n fence-agents-unsupported -#%%defattr(-,root,root,-) -#%%config(noreplace) %%{_sysconfdir}/cluster/fence_na.conf %{_sbindir}/fence_* -#%%exclude %%{_sbindir}/fence_cisco_ucs %exclude %{_sbindir}/fence_dummy %exclude %{_mandir}/man8/fence_dummy* %{_mandir}/man8/fence_* -#%%exclude %%{_mandir}/man8/fence_cisco_ucs* %{_libexecdir}/fence_* +%files devel +%{_sbindir}/fence_dummy +%{_mandir}/man8/fence_dummy* + %changelog