rpms/fence-agents/F-10 fence-agents.spec,1.4,1.5 sources,1.3,1.4

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/fence-agents/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23468

Modified Files:
	fence-agents.spec sources 
Log Message:
New upstream release fixes several major bugs



Index: fence-agents.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/fence-agents.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- fence-agents.spec	3 Mar 2009 07:33:44 -0000	1.4
+++ fence-agents.spec	31 Jul 2009 08:26:43 -0000	1.5
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2009 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -14,12 +14,12 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-%define alphatag alpha6
+## define alphatag rc4
 
 Name: fence-agents
 Summary: Fence Agents for Red Hat Cluster
 Version: 3.0.0
-Release: 6%{?alphatag:.%{alphatag}}%{?dist}
+Release: 14%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -28,29 +28,19 @@ Source0: ftp://sources.redhat.com/pub/cl
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 Requires: pexpect net-snmp-utils pyOpenSSL
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 ## 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)
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: perl python
 BuildRequires: glibc-devel
-BuildRequires: libxml2-devel
+BuildRequires: nss-devel nspr-devel
+BuildRequires: libxml2-devel libvirt-devel
 BuildRequires: clusterlib-devel >= 3.0.0
-BuildRequires: corosynclib-devel >= 0.94-1
-BuildRequires: openaislib-devel >= 0.93-1
-
-%if %{buildvirt}
-BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
-%endif
+BuildRequires: corosynclib-devel >= 1.0.0-1
+BuildRequires: openaislib-devel >= 1.0.0-1
 
 %prep
 %setup -q -n fence-agents-%{version}%{?alphatag:.%{alphatag}}
@@ -63,11 +53,6 @@ BuildRequires: nss-devel nspr-devel libv
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
-%if %{buildvirt}
-  --enable_virt \
-%endif
-  --corosynclibdir=%{_libdir}/corosync \
-  --openaislibdir=%{_libdir}/openais \
   --disable_kernel_check
 
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -75,26 +60,16 @@ BuildRequires: nss-devel nspr-devel libv
 CFLAGS="$(echo '%{optflags}')" make -C fence/agents
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make -C fence/agents install DESTDIR=$RPM_BUILD_ROOT
-make -C fence/man install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make -C fence/agents install DESTDIR=%{buildroot}
+make -C fence/man install DESTDIR=%{buildroot}
 
 ## tree fix up
 # fix libfence permissions
-chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/*.py
-chmod 0755 $RPM_BUILD_ROOT%{_datadir}/fence/telnet_ssl
+chmod 0755 %{buildroot}%{_datadir}/fence/*.py
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
-%post 
-/sbin/chkconfig --add scsi_reserve
-
-%preun 
-if [ "$1" = 0 ]; then
-	/sbin/service scsi_reserve stop >/dev/null 2>&1
-	/sbin/chkconfig --del scsi_reserve
-fi
+rm -rf %{buildroot}
 
 %description
 Red Hat Fence Agents is a collection of scripts to handle remote
@@ -103,15 +78,56 @@ power management for several devices.
 %files 
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
-%{_sysconfdir}/rc.d/init.d/scsi_reserve
-%dir %{_sysconfdir}/cluster/cman-notify.d
-%{_sysconfdir}/cluster/cman-notify.d/scsi_reserve_notify
 %{_sbindir}/fence*
 %{_datadir}/fence
-%{_datadir}/snmp/mibs/*
 %{_mandir}/man8/fence*
 
 %changelog
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-14
+- New upstream release
+- spec file updates:
+  * Update copyright header
+  * final release.. undefine alphatag
+  * BuildRequires and Requires corosync/openais 1.0.0-1 final.
+
+* Thu Jul  2 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-13.rc4
+- New upstream release.
+- spec file updates:
+  * BuildRequires / Requires: latest corosync and openais
+  * Drop --enable_virt. Now default upstream
+
+* Sat Jun 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-12.rc3
+- New upstream release.
+- spec file updates:
+  * BuildRequires / Requires: latest corosync and openais
+
+* Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-11.rc2
+- New upstream release  + git94df30ca63e49afb1e8aeede65df8a3e5bcd0970
+- spec file updates:
+  * BuildRequires / Requires: latest corosync and openais
+  * Build fence_xvm unconditionally now that libvirt is everywhere
+  * Drop telnet_ssl wrapper in favour of nss version
+
+* Tue Mar 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-10.rc1
+- New upstream release.
+- Cleanup BuildRequires to avoid to pull in tons of stuff when it's not
+  required.
+- Update BuildRoot usage to preferred versions/names.
+- Stop shipping powermib. Those are not required for operations anymore.
+
+* Thu Mar 12 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-9.beta1
+- Fix arch check for virt support.
+- Drop unrequired BuildRequires.
+- Drop unrequired Requires: on perl.
+
+* Mon Mar  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-8.beta1
+- New upstream release.
+- Update corosync/openais BuildRequires and Requires.
+
+* Fri Mar  6 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-7.alpha7
+- New upstream release.
+- Drop fence_scsi init stuff that's not required anylonger.
+
 * Tue Mar  3 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-6.alpha6
 - New upstream release.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fence-agents/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	3 Mar 2009 07:33:44 -0000	1.3
+++ sources	31 Jul 2009 08:26:43 -0000	1.4
@@ -1 +1 @@
-ce58a2548d880d709bc22777179acab5  fence-agents-3.0.0.alpha6.tar.gz
+7bc650a9654a4e5059120243666b5eb5  fence-agents-3.0.0.tar.gz