rpms/GFS/FC-4 GFS.spec,1.19,1.20 sources,1.12,1.13

[fedora-cvs-commits at redhat.com]

Author: cfeist

Update of /cvs/dist/rpms/GFS/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv9486

Modified Files:
	GFS.spec sources 
Log Message:
Synced FC-4 to RHEL4.


Index: GFS.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS/FC-4/GFS.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- GFS.spec	17 May 2005 18:53:25 -0000	1.19
+++ GFS.spec	16 Jun 2005 23:04:12 -0000	1.20
@@ -9,11 +9,12 @@
 ##
 ###############################################################################
 ###############################################################################
-%define subversion pre23
+%define major 6
+%define minor 1.0
 
 Name: GFS
-Version: 6.1
-Release: 0.pre23.6
+Version: %{major}.%{minor}
+Release: 1
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS - The Global File System
@@ -23,7 +24,7 @@
 Requires: initscripts >= 7.93.2.EL-1
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-Source0: gfs-%{version}-%{subversion}.tar.gz
+Source0: gfs-%{version}.tar.gz
 Patch1: gfs-6.1-pre22-norun.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
@@ -31,14 +32,14 @@
 GFS - The Global File System
 
 %prep
-%setup -q -n gfs-%{version}-%{subversion}
+%setup -q -n gfs-%{version}
 %patch1 -p1 -b .norun
 
 %build
 ./configure --mandir=%{_mandir}
-sed -i '/RELEASE_MAJOR/s/= .*/= %version/' make/defines.mk
-sed -i '/RELEASE_MINOR/s/= .*/= 0.%{subversion}/' make/defines.mk
-sed -i '/RELEASE /s/= .*/= %version-0.%{subversion}/' make/defines.mk
+sed -i '/RELEASE_MAJOR/s/= .*/= %{major}/' make/defines.mk
+sed -i '/RELEASE_MINOR/s/= .*/= %{minor}/' make/defines.mk
+sed -i '/RELEASE /s/= .*/= %{version}/' make/defines.mk
 make
 
 %install


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/GFS/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 May 2005 18:49:02 -0000	1.12
+++ sources	16 Jun 2005 23:04:12 -0000	1.13
@@ -1 +1 @@
-d091360e800669b53a728167effcc054  gfs-6.1-pre23.tar.gz
+46be4ec7c2ab2f04cc88af1ebcceb2c1  gfs-6.1.0.tar.gz