rpms/cluster/devel fence-man-pages.diff, NONE, 1.1 cluster.spec, 1.42, 1.43

Tue Feb 24 13:39:07 UTC 2009

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19512

Modified Files:
	cluster.spec 
Added Files:
	fence-man-pages.diff 
Log Message:
Stop building fence agents and resource agents.


fence-man-pages.diff:

--- NEW FILE fence-man-pages.diff ---
commit 2700dce4976a43bc56ea273cd51e6622fcdde58f
Author: Fabio M. Di Nitto <fdinitto at redhat.com>
Date:   Tue Feb 24 14:24:55 2009 +0100

    fence: fix fence agents man page installation
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>

diff --git a/fence/man/Makefile b/fence/man/Makefile
index 16fcd4e..36dfef4 100644
--- a/fence/man/Makefile
+++ b/fence/man/Makefile
@@ -1,5 +1,9 @@
-TARGET= fence.8 \
-	fenced.8  \
+include ../../make/defines.mk
+
+TARGET = fence.8 fenced.8 fence_node.8 fence_tool.8
+
+ifdef fence_agents
+TARGET += \
 	fence_ack_manual.8 \
 	fence_alom.8 \
 	fence_apc.8 \
@@ -18,14 +22,12 @@ TARGET= fence.8 \
 	fence_ldom.8 \
 	fence_manual.8 \
 	fence_mcdata.8 \
-	fence_node.8 \
 	fence_rackswitch.8 \
 	fence_rib.8 \
 	fence_rsa.8 \
 	fence_rsb.8 \
 	fence_sanbox2.8 \
 	fence_scsi.8 \
-	fence_tool.8 \
 	fence_vixel.8 \
 	fence_virsh.8 \
 	fence_vmware.8 \
@@ -34,6 +36,6 @@ TARGET= fence.8 \
 	fence_xvm.8 \
 	fence_xvmd.8 \
 	fence_zvm.8
+endif
 
-include ../../make/defines.mk
 include $(OBJDIR)/make/man.mk


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cluster.spec	24 Feb 2009 10:19:30 -0000	1.42
+++ cluster.spec	24 Feb 2009 13:38:36 -0000	1.43
@@ -19,20 +19,15 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-Release: 10%{?alphatag:.%{alphatag}}%{?dist}
+Release: 11%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Patch0: fence-man-pages.diff
 
 ## Setup/build bits
 
-# build support for virtualization
-%define buildvirt 0
-%ifarch i386 x86_64 ia64
-%define buildvirt 1
-%endif
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Build dependencies
@@ -42,24 +37,20 @@
 BuildRequires: corosynclib-devel >= 0.93-1
 BuildRequires: openaislib-devel >= 0.92-1
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
-%if %{buildvirt}
-BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
-%endif
 
 %prep
 %setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
+%patch0 -p1
 
 %build
-# for legacy reasons, all binaries have always been installed in /sbin
 ./configure \
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
-%if %{buildvirt}
-  --enable_virt \
-%endif
   --corosynclibdir=%{_libdir}/corosync \
   --openaislibdir=%{_libdir}/openais \
+  --without_fence_agents \
+  --without_resource_agents \
   --without_kernel_modules \
   --disable_kernel_check
 
@@ -69,11 +60,14 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
+## tree fix up
+# add config dir
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cluster
 # install logging bits
 mkdir -p $RPM_BUILD_ROOT/var/log/cluster
-
-## tree fix up
+# add cmanotifyd directory
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cluster/cman-notify.d
 # logrotate name
 mv $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cluster \
 	$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cman
@@ -83,9 +77,6 @@
 find $RPM_BUILD_ROOT -name "lib*.so.*" -exec chmod 0755 {} \;
 # fix lcrso permissions or fedora strip helpers won't work.
 find $RPM_BUILD_ROOT -name "*.lcrso" -exec chmod 0755 {} \;
-# fix libfence permissions
-chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/*.py
-chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/telnet_ssl
 # remove docs
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/cluster
 # cleanup perl bindings bits
@@ -113,17 +104,15 @@
 Requires(preun): chkconfig
 Requires: corosync >= 0.93-1
 Requires: openais >= 0.92-1
-Requires: sg3_utils OpenIPMI telnet openssh-clients
-Requires: pexpect net-snmp-utils pyOpenSSL
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
+Requires: fence-agents
 
 %description -n cman
 Red Hat Cluster Manager
 
 %post -n cman
 /sbin/chkconfig --add cman
-/sbin/chkconfig --add scsi_reserve
 /sbin/chkconfig --add qdiskd
 /sbin/ldconfig > /dev/null
 
@@ -131,10 +120,8 @@
 %preun -n cman
 if [ "$1" = 0 ]; then
 	/sbin/service qdiskd stop >/dev/null 2>&1
-	/sbin/service scsi_reserve stop >/dev/null 2>&1
 	/sbin/service cman stop >/dev/null 2>&1
 	/sbin/chkconfig --del qdiskd
-	/sbin/chkconfig --del scsi_reserve
 	/sbin/chkconfig --del cman
 fi
 
@@ -146,9 +133,7 @@
 %dir %{_sysconfdir}/cluster
 %{_sysconfdir}/rc.d/init.d/cman
 %{_sysconfdir}/rc.d/init.d/qdiskd
-%{_sysconfdir}/rc.d/init.d/scsi_reserve
 %dir %{_sysconfdir}/cluster/cman-notify.d
-%{_sysconfdir}/cluster/cman-notify.d/scsi_reserve_notify
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-dlm.rules
 %config(noreplace) %{_sysconfdir}/logrotate.d/cman
 %{_sbindir}/ccs*
@@ -159,8 +144,6 @@
 %{_sbindir}/gfs_control*
 %{_sbindir}/group*
 %{_sbindir}/*qdisk*
-%{_datadir}/fence
-%{_datadir}/snmp/mibs/*
 /usr/libexec/*
 %{perl_vendorarch}/*
 %dir /var/log/cluster
@@ -232,7 +215,7 @@
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
 License: GPLv2+ and LGPLv2+
 Requires: chkconfig initscripts glibc ncurses bash grep sed gawk
-Requires: cman
+Requires: cman resource-agents
 Requires: net-tools mount e2fsprogs
 Requires(post): chkconfig
 Requires(preun): initscripts
@@ -258,7 +241,6 @@
 %{_sbindir}/clu*
 %{_sbindir}/rgmanager
 %{_sbindir}/rg_test
-%{_datadir}/cluster
 %{_mandir}/man8/clu*
 
 %package -n gfs2-utils
@@ -329,6 +311,11 @@
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Tue Feb 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-11.alpha5
+- Stop building fence and resource agents.
+- cman now Requires: fence-agents.
+- rgmanager now Requires: resource-agents.
+
 * Tue Feb 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-10.alpha5
 - Fix typo in gfs-utils preun scriptlet.
 - Fix gfs-utils file list.


