rpms/gfs2-utils/F-8 gfs2-utils.spec,1.32,1.33

[Chris Feist (cfeist)]

Author: cfeist

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

Modified Files:
	gfs2-utils.spec 
Log Message:
More build fixes.


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-8/gfs2-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gfs2-utils.spec	8 Apr 2008 23:19:15 -0000	1.32
+++ gfs2-utils.spec	8 Apr 2008 23:33:20 -0000	1.33
@@ -13,7 +13,7 @@
 
 Name: gfs2-utils
 Version: 0.1.25.2.02.01
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS)
@@ -24,7 +24,7 @@
 BuildRequires: ncurses-devel
 BuildRequires: glibc-kernheaders
 BuildRequires: libvolume_id-devel
-BuildRequires: kernel-devel
+BuildRequires: kernel-devel kernel
 URL: http://sources.redhat.com/cluster/
 Source0: gfs2-%{version}.tar.gz
 Patch1: gfs2-utils-norun.patch
@@ -43,11 +43,9 @@
 %patch2 -p1 -b .tempondisk
 
 %build
-rpm -qs kernel-devel
 ls /lib/modules/
-ls %{_usrsrc}
-./configure --kernel_build=/lib/modules/%{kversion}/build --kernel_src=/lib/modules/%{kversion}/build --libdir=%{_libdir}
-./configure --disable_kernel_check --libdir=%{_libdir}
+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
 sed -i '/RELEASE /s/= .*/= %{version}/' make/defines.mk
@@ -67,6 +65,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd gfs2
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -74,8 +73,9 @@
 
 %files
 %defattr(-,root,root,-)
+/usr/sbin/*
 /sbin/*
-/etc/rc.d/init.d/gfs2
+/etc/init.d/gfs2
 
 %{_mandir}/*/*