rpms/gfs2-utils/F-8 gfs2-utils.spec,1.34,1.35

Steven Whitehouse (swhiteho) fedora-extras-commits at redhat.com
Wed Apr 9 15:01:53 UTC 2008


Author: swhiteho

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

Modified Files:
	gfs2-utils.spec 
Log Message:
Various updates so that I can do a test build. This fixes a few more
of the review comments and removes some obsolete stuff. I'm assured
that it ought to still build ok, so lets find out.




Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/F-8/gfs2-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- gfs2-utils.spec	9 Apr 2008 10:39:00 -0000	1.34
+++ gfs2-utils.spec	9 Apr 2008 15:01:10 -0000	1.35
@@ -13,7 +13,7 @@
 
 Name: gfs2-utils
 Version: 0.1.25.2.02.01
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2 and LGPLv2
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS2)
@@ -26,8 +26,6 @@
 BuildRequires: kernel-devel kernel
 URL: http://sources.redhat.com/cluster/wiki/
 Source0: gfs2-%{version}.tar.gz
-Patch1: gfs2-utils-norun.patch
-Patch2: gfs2-tempondisk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -38,20 +36,15 @@
 
 %prep
 %setup -q -n gfs2-%{version}
-%patch1 -p1 -b .norun
-%patch2 -p1 -b .tempondisk
 
 %build
-ls /lib/modules/
 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
 cd gfs2
-mkdir include/linux
-cp ../include/gfs2_ondisk.h include/linux/
-make
+make %{_smp_mflags}
 
 %post
 /sbin/chkconfig --add gfs2
@@ -79,6 +72,11 @@
 %{_mandir}/*/*
 
 %changelog
+* Wed Apr 09 2008 Steven Whitehouse <swhiteho at redhat.cm> 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)
+
 * Wed Apr 09 2008 Steven Whitehouse <swhiteho at redhat.com> 0.1.25.2.02.01-14
 - Update URL
 - Fix license spec




More information about the fedora-extras-commits mailing list