rpms/cluster/F-11 cluster.spec,1.48,1.49 sources,1.23,1.24

Tue Jul 28 12:47:53 UTC 2009

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23156

Modified Files:
	cluster.spec sources 
Log Message:
New upstream release fixes several major bugs



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/F-11/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	28 Jul 2009 12:47:52 -0000	1.49
@@ -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 rc1
+## define alphatag rc4
 
 Name: cluster
 Summary: Red Hat Cluster
 Version: 3.0.0
-Release: 15%{?alphatag:.%{alphatag}}%{?dist}
+Release: 20%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 URL: http://sources.redhat.com/cluster/wiki/
@@ -32,9 +32,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
 # Build dependencies
 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: libxml2-devel ncurses-devel slang-devel
+BuildRequires: corosynclib-devel >= 1.0.0-1
+BuildRequires: openaislib-devel >= 1.0.0-1
 BuildRequires: openldap-devel perl(ExtUtils::MakeMaker)
 
 %prep
@@ -45,7 +45,6 @@ BuildRequires: openldap-devel perl(ExtUt
   --sbindir=%{_sbindir} \
   --initddir=%{_sysconfdir}/rc.d/init.d \
   --libdir=%{_libdir} \
-  --openaislibdir=%{_libdir}/openais \
   --without_fence_agents \
   --without_resource_agents \
   --without_kernel_modules \
@@ -59,12 +58,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 +92,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 >= 1.0.0-1
+Requires: openais >= 1.0.0-1
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: ricci >= 0.15.0-4 modcluster >= 0.15.0-3
 Requires: fence-agents
@@ -110,7 +103,6 @@ Red Hat Cluster Manager
 
 %post -n cman
 /sbin/chkconfig --add cman
-/sbin/ldconfig > /dev/null
 
 # make sure to stop cman always as last
 %preun -n cman
@@ -119,8 +111,6 @@ if [ "$1" = 0 ]; then
 	/sbin/chkconfig --del cman
 fi
 
-%postun -n cman -p /sbin/ldconfig
-
 %files -n cman
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.licence doc/*.txt config/plugins/ldap/*.ldif
@@ -138,6 +128,8 @@ fi
 %{_sbindir}/group*
 %{_sbindir}/*qdisk*
 /usr/libexec/*
+%dir %{_datadir}/cluster
+%{_datadir}/cluster/cluster.rng
 %{perl_vendorarch}/*
 %dir /var/log/cluster
 %{_mandir}/man5/*
@@ -207,9 +199,8 @@ The Red Hat Cluster libraries developmen
 Group: System Environment/Base
 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: chkconfig initscripts
 Requires: cman resource-agents
-Requires: net-tools mount e2fsprogs
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
@@ -242,6 +233,7 @@ Summary: Utilities for managing the glob
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
+Requires: file
 
 %description -n gfs2-utils
 The gfs2-utils package contains a number of utilities for creating,
@@ -261,7 +253,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*
 
@@ -272,6 +264,7 @@ Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
 Requires: gfs2-utils
+Requires: file
 
 %description -n gfs-utils
 The gfs-utils package contains a number of utilities for creating,
@@ -291,14 +284,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 +300,42 @@ fi
 %{_mandir}/man8/*.gfs.*
 
 %changelog
+* Tue Jul 28 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-20
+- 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-19.rc4
+- New upstream release
+- spec file updates:
+  * cman subpackage: avoid unnecessary calls to ldconfig
+  * rgmanager subpackage: drop unrequired Requires: that belong to ras
+  * BuildRequires and Requires corosync/openais 1.0.0.rc1
+
+* Sat Jun 20 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-18.rc3
+- New upstream release
+- spec file updates:
+  * Drop local patches.
+  * Update BuildRequires and Requires: on newer corosync/openais.
+
+* Thu Jun 11 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 3.0.0-17.rc2
+- Update from git up to 779dd3c23ca6c56f5b3f7a8a7831bae775c85201
+- spec file updates:
+  * Drop BuildRequires on libvolume_id-devel that's now obsoleted
+  * gfs*-utils now Requires: file
+  * Add temporary patch to get rid of volume_id references in the code
+
+* 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/F-11/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	28 Jul 2009 12:47:53 -0000	1.24
@@ -1 +1 @@
-ca40dcee847586cf1c8dd7ee965c3252  cluster-3.0.0.rc1.tar.gz
+93101d0f3c724a46caee1f9f16abe4af  cluster-3.0.0.tar.gz


