rpms/cluster/devel cluster.spec, 1.2, 1.3 cluster-dlmheaders.patch, 1.1, NONE

[Fabio M. Di Nitto (fabbione)]

Author: fabbione

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

Modified Files:
	cluster.spec 
Removed Files:
	cluster-dlmheaders.patch 
Log Message:
Prepare new release



Index: cluster.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cluster/devel/cluster.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cluster.spec	20 May 2008 19:25:56 -0000	1.2
+++ cluster.spec	22 May 2008 07:59:02 -0000	1.3
@@ -19,16 +19,12 @@
 Name: cluster
 Summary: Red Hat Cluster
 Version: 2.99.02
-Release: 2%{?alphatag:.%{alphatag}}%{?dist}
+Release: 3%{?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}.tar.gz
 Source1: cluster.logrotate
-# 2.99.01 requires 2.6.26 headers to build but it can run on 2.6.25 or lower
-# in compat mode. As long as the new headers are not propagated in Fedora,
-# use a local copy that will go away.
-Patch0: cluster-dlmheaders.patch
 
 ## Setup/build bits
 
@@ -42,7 +38,7 @@
 
 # Build dependencies
 BuildRequires: perl python
-BuildRequires: glibc-kernheaders glibc-devel kernel-devel
+BuildRequires: glibc-kernheaders glibc-devel
 BuildRequires: libxml2-devel ncurses-devel slang-devel libvolume_id-devel
 BuildRequires: openais-devel >= 0.83-3
 %if %{buildxen}
@@ -51,12 +47,8 @@
 
 %prep
 %setup -q -n cluster-%{version}
-%patch0 -p1
 
 %build
-# required by dlm and gfs2-utils for now. Investigate if we can drop it
-ksrc="$(ls -d /usr/src/kernels/*)"
-
 # for legacy reasons, all binaries have always been installed in /sbin
 ./configure \
   --sbindir=/sbin \
@@ -68,8 +60,6 @@
   --openaislibdir=%{_libdir}/openais \
   --without_gfs \
   --without_gnbd \
-  --kernel_build=${ksrc} \
-  --kernel_src=${ksrc} \
   --disable_kernel_check
 
 ##CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
@@ -113,10 +103,6 @@
 %package -n cman
 Group: System Environment/Base
 Summary: Red Hat Cluster Manager
-# None of those packages have been in the pool since F7.
-#Obsoletes: fence ccs dlm
-#Conflicts: GFS <= 6.0
-#Conflicts: GFS-modules
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
@@ -249,6 +235,13 @@
 %{_mandir}/man8/*gfs2*
 
 %changelog
+* Thu May 22 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.02-3
+- New kernel-headers has what we need release.
+- Drop BR on kernel-devel.
+- Drop cluster-dlmheaders.patch.
+- Drop --kernel_* from configure invokation.
+- Cleanup a few comments in the spec file.
+
 * Tue May 20 2008 Fabio M. Di Nitto <fdinitto at redhat.com> - 2.99.02-2
 - disable parallel build (broken upstream)
 - build requires higher openais (fix ppc64 build failure)


--- cluster-dlmheaders.patch DELETED ---