rpms/cluster/devel .cvsignore, 1.23, 1.24 cluster.spec, 1.48, 1.49 sources, 1.23, 1.24

[Fabio M. Di Nitto]

Author: fabbione

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

Modified Files:
	.cvsignore cluster.spec sources 
Log Message:
Update to cluster 3.0.0-rc2 + git 94df30ca63e49afb1e8aeede65df8a3e5bcd0970



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore	24 Mar 2009 09:06:11 -0000	1.23
+++ .cvsignore	10 Jun 2009 08:47:09 -0000	1.24
@@ -1 +1,2 @@
-cluster-3.0.0.rc1.tar.gz
+cluster-3.0.0.rc2.tar.gz
+cluster-head.diff


Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- cluster.spec	24 Mar 2009 09:06:11 -0000	1.48
+++ cluster.spec	10 Jun 2009 08:47:09 -0000	1.49
@@ -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: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-Release: 15%{?alphatag:.%{alphatag}}%{?dist}
+Release: 16%{?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: cluster-head.diff
 
 ## Setup/build bits
 
@@ -33,19 +34,19 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
-BuildRequires: corosynclib-devel >= 0.95-1
-BuildRequires: openaislib-devel >= 0.94-1
+BuildRequires: corosynclib-devel >= 0.97-1.svn2226
+BuildRequires: openaislib-devel >= 0.96-1.svn1951
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
 
 %prep
 %setup -q -n cluster-%{version}%{?alphatag:.%{alphatag}}
+%patch0 -p1
 
 %build
 ./configure \
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
-  --openaislibdir=%{_libdir}/openais \
   --without_fence_agents \
   --without_resource_agents \
   --without_kernel_modules \
@@ -59,12 +60,6 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 ## tree fix up
-# add config dir
-mkdir -p %{buildroot}%{_sysconfdir}/cluster
-# install logging bits
-mkdir -p %{buildroot}/var/log/cluster
-# add cmanotifyd directory
-mkdir -p %{buildroot}%{_sysconfdir}/cluster/cman-notify.d
 # logrotate name
 mv %{buildroot}%{_sysconfdir}/logrotate.d/cluster \
 	%{buildroot}%{_sysconfdir}/logrotate.d/cman
@@ -99,8 +94,8 @@ Summary: Red Hat Cluster Manager
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: corosync >= 0.95-1
-Requires: openais >= 0.94-1
+Requires: corosync >= 0.97-1.svn2226
+Requires: openais >= 0.96-1.svn1951
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
 Requires: fence-agents
@@ -138,6 +133,8 @@ fi
 %{_sbindir}/group*
 %{_sbindir}/*qdisk*
 /usr/libexec/*
+%dir %{_datadir}/cluster
+%{_datadir}/cluster/cluster.rng
 %{perl_vendorarch}/*
 %dir /var/log/cluster
 %{_mandir}/man5/*
@@ -261,7 +258,7 @@ fi
 %defattr(-,root,root,-)
 %doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
 %{_sysconfdir}/rc.d/init.d/gfs2
-/sbin/mount.gfs2
+/sbin/*.gfs2
 %{_sbindir}/*gfs2*
 %{_mandir}/man8/*gfs2*
 
@@ -291,14 +288,13 @@ fi
 %defattr(-,root,root,-)
 %doc doc/COPYRIGHT doc/README.licence doc/COPYING.*
 %{_sysconfdir}/rc.d/init.d/gfs
-/sbin/mount.gfs
+/sbin/*.gfs
 %{_sbindir}/gfs_debug
 %{_sbindir}/gfs_edit
 %{_sbindir}/gfs_grow
 %{_sbindir}/gfs_jadd
 %{_sbindir}/gfs_quota
 %{_sbindir}/gfs_tool
-%{_sbindir}/*.gfs
 %{_mandir}/man8/gfs.*
 %{_mandir}/man8/gfs_edit*
 %{_mandir}/man8/gfs_grow*
@@ -308,6 +304,15 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-16.rc2
+- New upstream release + git94df30ca63e49afb1e8aeede65df8a3e5bcd0970
+- spec file updates:
+  * BuildRequires / Requires: latest corosync and openais
+  * Update configure invokation
+  * Cleanup tree fix up bits that are now upstream
+  * Ship cluster.rng
+  * Move fsck/mkfs gfs/gfs2 binaries in /sbin to be FHS compliant
+
 * Tue Mar 24 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-15.rc1
 - New upstream release.
 - Update corosync/openais BuildRequires and Requires.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	24 Mar 2009 09:06:11 -0000	1.23
+++ sources	10 Jun 2009 08:47:09 -0000	1.24
@@ -1 +1,2 @@
-ca40dcee847586cf1c8dd7ee965c3252  cluster-3.0.0.rc1.tar.gz
+095ee7ff91d89d04ce60c3d06686da4d  cluster-3.0.0.rc2.tar.gz
+b7520164d4dfde326cbfab76c9e830a4  cluster-head.diff