Update to rc2 + git 94df30ca63e49afb1e8aeede65df8a3e5bcd0970

.cvsignore

@@ -1 +1 @@
-fence-agents-3.0.0.rc1.tar.gz
+fence-agents-3.0.0.rc2.tar.gz

fence-agents.spec

@@ -14,16 +14,17 @@
 # http://www.rpm.org/max-rpm/s1-rpm-subpack-spec-file-changes.html
 
 # keep around ready for later user
-%define alphatag rc1
+%define alphatag rc2
 
 Name: fence-agents
 Summary: Fence Agents for 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/fence-agents-%{version}%{?alphatag:.%{alphatag}}.tar.gz
+Patch0: fence-agents-head.diff
 
 ## Runtime deps
 Requires: sg3_utils OpenIPMI telnet openssh-clients
@@ -31,28 +32,20 @@ Requires: pexpect net-snmp-utils pyOpenSSL
 
 ## Setup/build bits
 
-# build support for virtualization
-%define buildvirt 0
-%ifarch i386 i486 i586 i686 x86_64 ia64
-%define buildvirt 1
-%endif
-
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # Build dependencies
 BuildRequires: perl python
 BuildRequires: glibc-devel
-
-%if %{buildvirt}
-BuildRequires: libxml2-devel
+BuildRequires: nss-devel nspr-devel
+BuildRequires: libxml2-devel libvirt-devel
 BuildRequires: clusterlib-devel >= 3.0.0
-BuildRequires: corosynclib-devel >= 0.95-1
-BuildRequires: openaislib-devel >= 0.94-1
-BuildRequires: nss-devel nspr-devel libvirt-devel
-%endif
+BuildRequires: corosynclib-devel >= 0.97-1.svn2226
+BuildRequires: openaislib-devel >= 0.96-1.svn1951
 
 %prep
 %setup -q -n fence-agents-%{version}%{?alphatag:.%{alphatag}}
+%patch0 -p1
 
 # we inherit configure from cluster project. Configure it for vars we need.
 # building from source directly without those parameters will NOT work.
@@ -62,10 +55,7 @@ BuildRequires: nss-devel nspr-devel libvirt-devel
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
-%if %{buildvirt}
   --enable_virt \
-  --openaislibdir=%{_libdir}/openais \
-%endif
   --disable_kernel_check
 
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -80,7 +70,6 @@ make -C fence/man install DESTDIR=%{buildroot}
 ## tree fix up
 # fix libfence permissions
 chmod 0755 %{buildroot}%{_datadir}/fence/*.py
-chmod 0755 %{buildroot}%{_datadir}/fence/telnet_ssl
 
 %clean
 rm -rf %{buildroot}
@@ -97,6 +86,13 @@ power management for several devices.
 %{_mandir}/man8/fence*
 
 %changelog
+* Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto@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@redhat.com> - 3.0.0-10.rc1
 - New upstream release.
 - Cleanup BuildRequires to avoid to pull in tons of stuff when it's not

sources

@@ -1 +1 @@
-a680218a4d297608232f51281445e150  fence-agents-3.0.0.rc1.tar.gz
+d98bd8cd184cc6e0c092f7bb7c7967f7  fence-agents-3.0.0.rc2.tar.gz