rpms/GFS-kernel/devel gfs-kernel-2.6.11.2-20050425.154843.FC4.patch, NONE, 1.1 GFS-kernel.spec, 1.32, 1.33

[fedora-cvs-commits at redhat.com]

Author: cfeist

Update of /cvs/dist/rpms/GFS-kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9296

Modified Files:
	GFS-kernel.spec 
Added Files:
	gfs-kernel-2.6.11.2-20050425.154843.FC4.patch 
Log Message:
Added patch to deal with gulm and gcc4.

gfs-kernel-2.6.11.2-20050425.154843.FC4.patch:
 xdr_base.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gfs-kernel-2.6.11.2-20050425.154843.FC4.patch ---
--- gfs-kernel-2.6.11.2-20050425.154843.FC4/src/gulm/xdr_base.c.gcc4	2005-04-25 15:48:50.000000000 -0500
+++ gfs-kernel-2.6.11.2-20050425.154843.FC4/src/gulm/xdr_base.c	2005-04-25 16:24:36.000000000 -0500
@@ -384,7 +384,7 @@ xdr_enc_raw (xdr_enc_t * xdr, void *p, u
 		return e;
 	*(xdr->stream + xdr->curloc) = XDR_RAW;
 	xdr->curloc += 1;
-	(uint16_t) * ((uint16_t *) (xdr->stream + xdr->curloc)) =
+	*((uint16_t *)xdr->stream + xdr->curloc) =
 	    cpu_to_be16 (len);
 	xdr->curloc += 2;
 	memcpy ((xdr->stream + xdr->curloc), p, len);
@@ -410,7 +410,7 @@ xdr_enc_raw_iov (xdr_enc_t * xdr, int co
 	/* copy in header and size */
 	*(xdr->stream + xdr->curloc) = XDR_RAW;
 	xdr->curloc += 1;
-	(uint16_t) * ((uint16_t *) (xdr->stream + xdr->curloc)) =
+	*((uint16_t *)xdr->stream + xdr->curloc) =
 	    cpu_to_be16 (total);
 	xdr->curloc += 2;
 	/* copy in all iovbufs */
@@ -438,7 +438,7 @@ xdr_enc_string (xdr_enc_t * xdr, uint8_t
 		return e;
 	*(xdr->stream + xdr->curloc) = XDR_STRING;
 	xdr->curloc += 1;
-	(uint16_t) * ((uint16_t *) (xdr->stream + xdr->curloc)) =
+	*((uint16_t *)xdr->stream + xdr->curloc) =
 	    cpu_to_be16 (len);
 	xdr->curloc += 2;
 	if (len > 0) {


Index: GFS-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- GFS-kernel.spec	25 Apr 2005 20:56:28 -0000	1.32
+++ GFS-kernel.spec	25 Apr 2005 21:26:16 -0000	1.33
@@ -20,7 +20,7 @@
 
 Name: GFS-kernel
 Version: 2.6.11.2
-Release: 20050425.154843.FC4.1
+Release: 20050425.154843.FC4.2
 License: GPL
 Group: System Environment/Kernel
 Summary: GFS-kernel - The Global File System kernel modules
@@ -38,6 +38,7 @@
 Provides: kernel-modules
 ExclusiveArch: i686 x86_64
 Source0: gfs-kernel-%{version}-%{subversion}.tar.gz
+Patch1: gfs-kernel-2.6.11.2-20050425.154843.FC4.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
@@ -70,6 +71,7 @@
 ################################################################################
 %prep
 %setup -q -n gfs-kernel-%{version}-%{subversion}
+%patch1 -p1 -b .gcc4
 # Put the version information into the necessary files
 sed  -i -e '/RELEASE_NAME/s/"<CVS>"/"%{version}-%{release}"/' \
 	src/nolock/main.c src/gulm/gulm.h src/gfs/gfs.h src/harness/main.c