rpms/gfs2-utils/devel .cvsignore, 1.11, 1.12 gfs2-utils.spec, 1.21, 1.22 sources, 1.12, 1.13 gfs2-tempondisk.patch, 1.1, NONE gfs2-utils-norun.patch, 1.1, NONE

[Steven Whitehouse (swhiteho)]

Author: swhiteho

Update of /cvs/pkgs/rpms/gfs2-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8556

Modified Files:
	.cvsignore gfs2-utils.spec sources 
Removed Files:
	gfs2-tempondisk.patch gfs2-utils-norun.patch 
Log Message:
Bring rawhide uptodate with F-8 now that F-8 is in a reasonable state.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	9 Oct 2006 18:53:30 -0000	1.11
+++ .cvsignore	14 Apr 2008 09:47:05 -0000	1.12
@@ -1 +1 @@
-gfs2-0.1.9.tar.gz
+cluster-2.03.00.tar.gz


Index: gfs2-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/devel/gfs2-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gfs2-utils.spec	18 Feb 2008 22:25:15 -0000	1.21
+++ gfs2-utils.spec	14 Apr 2008 09:47:05 -0000	1.22
@@ -11,43 +11,41 @@
 ###############################################################################
 
 Name: gfs2-utils
-Version: 0.1.25
-Release: 2%{?dist}
-License: GPL
+Version: 2.03.00
+Release: 3%{?dist}
+License: GPLv2 and LGPLv2
 Group: System Environment/Kernel
-Summary: Utilities for managing the global filesystem (GFS)
-#ExclusiveArch: %{ix86} x86_64
+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
-URL: http://sources.redhat.com/cluster/
-Source0: gfs2-%{version}.tar.gz
-Patch1: gfs2-utils-norun.patch
-Patch2: gfs2-tempondisk.patch
+BuildRequires: kernel-devel
+BuildRequires: perl
+URL: http://sources.redhat.com/cluster/wiki/
+# 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)
 
 
 %description
 The gfs2-utils package contains a number of utilities for creating,
-checking, modifying, and correcting any inconsistencies in GFS
+checking, modifying, and correcting any inconsistencies in GFS2
 filesystems.
 
 %prep
-%setup -q -n gfs2-%{version}
-%patch1 -p2 -b .norun
-%patch2 -p1 -b .tempondisk
+%setup -q -n cluster-%{version}
 
 %build
-./configure --kernel_src=/usr --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
-mkdir include/linux
-cp include/gfs2_ondisk.h include/linux/
-make
+ksrc=`ls -d /usr/src/kernels/*`
+./configure --kernel_build=${ksrc} --kernel_src=${ksrc} --libdir=%{_libdir} --release_version=%{version}
+cd gfs2
+make %{_smp_mflags}
 
 %post
 /sbin/chkconfig --add gfs2
@@ -60,6 +58,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd gfs2
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -67,14 +66,30 @@
 
 %files
 %defattr(-,root,root,-)
+/usr/sbin/*
 /sbin/*
-/etc/rc.d/init.d/gfs2
-
+/etc/init.d/gfs2
 %{_mandir}/*/*
 
 %changelog
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.25-2
-- Autorebuild for GCC 4.3
+* Mon Apr 14 2008 Steven Whitehouse <swhiteho at redhat.com> 2.03.00-3
+- Fabbione saves the day. We can get rid of the sed stuff after all
+
+* 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
+
+* 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)
+
+* Wed Apr 09 2008 Steven Whitehouse <swhiteho at redhat.com> 0.1.25.2.02.01-14
+- Update URL
+- Fix license spec
+
+* Fri Mar 14 2008 Chris Feist <cfeist at redhat.com> 0.1.25.2.02.00-2
+- New upstream sources.
 
 * Tue Jan 16 2007 Chris Feist <cfeist at redhat.com> 0.1.24-1
 - New upstream sources.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gfs2-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	21 Feb 2007 20:41:58 -0000	1.12
+++ sources	14 Apr 2008 09:47:05 -0000	1.13
@@ -1 +1 @@
-0f40f3028edb2f0a7be77390e1ee862e  gfs2-0.1.25.tar.gz
+48921660b484849843af9edce107f5ee  cluster-2.03.00.tar.gz


--- gfs2-tempondisk.patch DELETED ---


--- gfs2-utils-norun.patch DELETED ---