rpms/gfs2-utils/F-8 .cvsignore, 1.13, 1.14 gfs2-utils.spec, 1.35, 1.36 sources, 1.14, 1.15

[Steven Whitehouse (swhiteho)]

Author: swhiteho

Update of /cvs/pkgs/rpms/gfs2-utils/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17500

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Log Message:
New upstream sources.
Fix kernel version dep as per Eric's suggestion




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-8/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	8 Apr 2008 21:59:49 -0000	1.13
+++ .cvsignore	14 Apr 2008 08:22:41 -0000	1.14
@@ -1 +1 @@
-gfs2-0.1.25.2.02.01.tar.gz
+cluster-2.03.00.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-8/gfs2-utils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gfs2-utils.spec	9 Apr 2008 15:01:10 -0000	1.35
+++ gfs2-utils.spec	14 Apr 2008 08:22:41 -0000	1.36
@@ -9,23 +9,27 @@
 ##
 ###############################################################################
 ###############################################################################
-%define kversion 2.6.24.4-64.fc8
 
 Name: gfs2-utils
-Version: 0.1.25.2.02.01
-Release: 15%{?dist}
+Version: 2.03.00
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS2)
 Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service
 Requires(preun): /sbin/chkconfig
 Requires: ncurses
 BuildRequires: ncurses-devel
 BuildRequires: glibc-kernheaders
 BuildRequires: libvolume_id-devel
-BuildRequires: kernel-devel kernel
+BuildRequires: kernel-devel
+BuildRequires: perl
 URL: http://sources.redhat.com/cluster/wiki/
-Source0: gfs2-%{version}.tar.gz
+# This file comes from the link at the above URL (cluster 2).
+# For the rawhide rpm we use a checkout of the -git tree (cluster 3)
+# rather than the release version (which we use for all F-? versions).
+Source0: cluster-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -35,13 +39,11 @@
 filesystems.
 
 %prep
-%setup -q -n gfs2-%{version}
+%setup -q -n cluster-%{version}
 
 %build
-ksrc=/lib/modules/%{kversion}/build/
-./configure --kernel_build=${ksrc} --kernel_src=${ksrc} --libdir=%{_libdir}
-sed -i '/RELEASE_MAJOR/s/= .*/= 0/' make/defines.mk
-sed -i '/RELEASE_MINOR/s/= .*/= 1.0/' make/defines.mk
+ksrc=`ls -d /usr/src/kernels/*`
+./configure --kernel_build=${ksrc} --kernel_src=${ksrc} --libdir=%{_libdir} --release_major="0" --release_minor="0"
 sed -i '/RELEASE /s/= .*/= %{version}/' make/defines.mk
 cd gfs2
 make %{_smp_mflags}
@@ -68,11 +70,16 @@
 /usr/sbin/*
 /sbin/*
 /etc/init.d/gfs2
-
 %{_mandir}/*/*
 
 %changelog
-* Wed Apr 09 2008 Steven Whitehouse <swhiteho at redhat.cm> 0.1.25.2.02.01-15
+* Mon Apr 14 2008 Steven Whitehouse <swhiteho at redhat.com> 2.03.00-1
+- New upstream sources
+- Eric Sandeen's solution to kernel version dep
+- Fred might have sed right, but there is no need for us to mangle version
+  numbers with it since configure does the right thing itself now.
+
+* Wed Apr 09 2008 Steven Whitehouse <swhiteho at redhat.com> 0.1.25.2.02.01-15
 - Remove obsolete chkconfig patch for initscript
 - Enable parallel make
 - Remove obsolete copy of gfs2_ondisk.h (this should be in glibc-kernheaders)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	8 Apr 2008 21:59:49 -0000	1.14
+++ sources	14 Apr 2008 08:22:41 -0000	1.15
@@ -1 +1 @@
-b971d8f4647dfebd6f80921140a4a889  gfs2-0.1.25.2.02.01.tar.gz
+48921660b484849843af9edce107f5ee  cluster-2.03.00.tar.gz