rpms/cluster/devel cluster.spec,1.6,1.7

[Fabio M. Di Nitto (fabbione)]

Author: fabbione

Update of /cvs/pkgs/rpms/cluster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13386

Modified Files:
	cluster.spec 
Log Message:
Update spec file for new upstream release



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cluster.spec	9 Jun 2008 07:34:28 -0000	1.6
+++ cluster.spec	24 Jun 2008 07:38:27 -0000	1.7
@@ -18,7 +18,7 @@
 
 Name: cluster
 Summary: Red Hat Cluster
-Version: 2.99.04
+Version: 2.99.05
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -40,7 +40,7 @@
 BuildRequires: perl python
 BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
-BuildRequires: openais-devel >= 0.83-3
+BuildRequires: openais-devel >= 0.84-1
 %if %{buildxen}
 BuildRequires: nss-devel nspr-devel libvirt-devel xen-libs
 %endif
@@ -58,8 +58,7 @@
   --enable_xen \
 %endif
   --openaislibdir=%{_libdir}/openais \
-  --without_gfs \
-  --without_gnbd \
+  --without_kernel_modules \
   --disable_kernel_check
 
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -104,7 +103,7 @@
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
-Requires: openais >= 0.83 sg3_utils
+Requires: openais >= 0.84 sg3_utils
 Requires: sg3_utils OpenIPMI telnet openssh-clients
 
 %description -n cman
@@ -177,7 +176,7 @@
 %package -n rgmanager
 Group: System Environment/Base
 Summary: Open Source HA Resource Group Failover for Red Hat Cluster
-License: GPLv2+ and LGPLv2+ and OSL 2.0+
+License: GPLv2+ and LGPLv2+
 Requires: chkconfig initscripts glibc ncurses bash grep sed gawk
 Requires: cman
 Requires: net-tools mount e2fsprogs
@@ -235,7 +234,66 @@
 /sbin/*gfs2*
 %{_mandir}/man8/*gfs2*
 
+%package -n gfs-utils
+Group: System Environment/Kernel
+Summary: Utilities for managing the global filesystem (GFS)
+Requires(post): chkconfig
+Requires(preun): initscripts
+Requires(preun): chkconfig
+Requires: gfs2-utils
+
+%description -n gfs-utils
+The gfs-utils package contains a number of utilities for creating,
+checking, modifying, and correcting any inconsistencies in GFS
+filesystems. This package requires the GFS kernel module.
+
+%post -n gfs-utils
+/sbin/chkconfig --add gfs
+
+%preun -n gfs-utils
+if [ "$1" = 0 ]; then
+	/sbin/service gfs stop >/dev/null 2>&1
+	/sbin/chkconfig --del gfs2
+fi
+
+%files -n gfs-utils
+%defattr(-,root,root,-)
+%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries
+%{_sysconfdir}/rc.d/init.d/gfs
+/sbin/gfs_*
+/sbin/*.gfs
+%{_mandir}/man8/gfs.*
+%{_mandir}/man8/gfs_*
+
+%package -n gnbd-utils
+Group: System Environment/Kernel
+Summary: Utilities for managing the GFS Network Block Device
+Requires(post): chkconfig
+Requires(preun): initscripts
+Requires(preun): chkconfig
+
+%description -n gnbd-utils
+The gnbd-utils package contains a number of utilities for exporting,
+importing and managing GFS Network Block Devices.
+This package requires the GNBD kernel module.
+
+%files -n gnbd-utils
+%defattr(-,root,root,-)
+%doc COPYRIGHT README.licence COPYING.applications COPYING.libraries
+# %%{_sysconfdir}/rc.d/init.d/gfs
+/sbin/gnbd_*
+%{_mandir}/man8/gnbd*
+
 %changelog
+* Tue Jun 24 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.05-1
+- New upstream release
+- Update licence tags again after upstream relicensing to kill OSL 2.1.
+- Add 2 commodity packages (gfs-utils and gnbd-utils). They both
+  require external kernel modules but at least userland will stay
+  automatically in sync for our users.
+- BR openais 0.84 for new logsys symbols (and requires for runtime).
+- Update build section to enable gfs-utils and gnbd-utils.
+
 * Mon Jun  9 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.04-1
 - New upstream release
 - Update license tags after major upstream cleanup (note: rgmanager