Index: /branches/fc11-dev/server/common/patches/openafs-delta-dprintf-rename-20090427.patch
===================================================================
--- /branches/fc11-dev/server/common/patches/openafs-delta-dprintf-rename-20090427.patch	(revision 1139)
+++ /branches/fc11-dev/server/common/patches/openafs-delta-dprintf-rename-20090427.patch	(revision 1139)
@@ -0,0 +1,90 @@
+===================================================================
+RCS file: /cvs/openafs/src/bucoord/bc.p.h,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- openafs/src/bucoord/bc.p.h	2009/03/16 13:32:04	1.8
++++ openafs/src/bucoord/bc.p.h	2009/04/27 19:17:14	1.9
+@@ -144,4 +144,4 @@
+ #define	BC_MAXSIMDUMPS	    64
+ #define BC_MAXPORTS	    128	/* max number of port offsets for volrestore */
+ /* debugging support */
+-#define	dprintf(x)
++#define	afs_dprintf(x)
+===================================================================
+RCS file: /cvs/openafs/src/bucoord/ubik_db_if.c,v
+retrieving revision 1.17
+retrieving revision 1.18
+diff -u -r1.17 -r1.18
+--- openafs/src/bucoord/ubik_db_if.c	2009/03/27 13:45:49	1.17
++++ openafs/src/bucoord/ubik_db_if.c	2009/04/27 19:17:14	1.18
+@@ -574,7 +574,7 @@
+ 
+     fileSize = (afs_int32) filesize(ctPtr->textStream);
+ 
+-    dprintf(("filesize is %d\n", fileSize));
++    afs_dprintf(("filesize is %d\n", fileSize));
+ 
+     rewind(ctPtr->textStream);
+ 
+@@ -1350,7 +1350,7 @@
+ 	ERROR(errno);
+ #endif
+ 
+-    dprintf(("file is %s\n", tmpFileName));
++    afs_dprintf(("file is %s\n", tmpFileName));
+ 
+   normal_exit:
+     return code;
+===================================================================
+RCS file: /cvs/openafs/src/config/debug.h,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- openafs/src/config/debug.h	2003/07/15 23:14:55	1.4
++++ openafs/src/config/debug.h	2009/04/27 19:17:12	1.5
+@@ -112,21 +112,21 @@
+ 
+ #if defined(AFS_DEBUG)
+ #if defined(lint)
+-#define dprintf(flag, str) printf str
++#define afs_dprintf(flag, str) printf str
+ #define dlprintf(flag, level, str) printf str
+ #define dmprintf(flag, bit, str) printf str
+ #else /* lint */
+-#define dprintf(flag, str) \
++#define afs_dprintf(flag, str) \
+       (void)((flag) ? \
+ 	     ( osi_dp str, osi_dp("\t%s, %d\n", __FILE__, __LINE__)):0)
+-#define dlprintf(flag, level, str) dprintf(((flag) >= (level)), str)
+-#define dmprintf(flag, bit, str) dprintf(((flag)&(1<<((bit)-1))), str)
++#define dlprintf(flag, level, str) afs_dprintf(((flag) >= (level)), str)
++#define dmprintf(flag, bit, str) afs_dprintf(((flag)&(1<<((bit)-1))), str)
+ 
+ #endif /* lint */
+ 
+ #else /* AFS_DEBUG */
+ 
+-#define dprintf(flag, str)
++#define afs_dprintf(flag, str)
+ #define dlprintf(flag, level,str)
+ #define dmprintf(flag, bit, str)
+ 
+===================================================================
+RCS file: /cvs/openafs/src/sgistuff/rcmd.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- openafs/src/sgistuff/rcmd.c	2005/08/16 17:58:27	1.1
++++ openafs/src/sgistuff/rcmd.c	2009/04/27 19:17:15	1.2
+@@ -55,8 +55,8 @@
+ #endif /* defined(AFS_HPUX_ENV) */
+ #ifdef	TCP_DEBUG
+ #include <sys/syslog.h>
+-#	define	DPRINTF(args)	dprintf args
+-dprintf(args)
++#	define	DPRINTF(args)	afs_dprintf args
++afs_dprintf(args)
+      char *args;
+ {
+     char **argv;
Index: /branches/fc11-dev/server/fedora/specs/openafs.spec.patch
===================================================================
--- /branches/fc11-dev/server/fedora/specs/openafs.spec.patch	(revision 1138)
+++ /branches/fc11-dev/server/fedora/specs/openafs.spec.patch	(revision 1139)
@@ -1,4 +1,4 @@
---- openafs.spec.orig	2009-04-08 08:17:00.000000000 -0400
-+++ openafs.spec	2009-04-14 04:32:44.000000000 -0400
+--- openafs.spec.orig	2009-06-03 04:16:03.000000000 -0400
++++ openafs.spec	2009-06-03 04:18:10.000000000 -0400
 @@ -8,7 +8,7 @@
  # for beta/rc releases make pkgrel 0.X.<tag>
@@ -10,5 +10,5 @@
  %if %{?osvers:0}%{!?osvers:1}
  %define osvers 1
-@@ -261,6 +261,11 @@
+@@ -261,6 +261,12 @@
  %endif
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -18,9 +18,10 @@
 +Patch1002: openafs-pts-encrypt.patch
 +Patch1003: openafs-localcsdb.patch
++Patch1004: openafs-delta-dprintf-rename-20090427.patch
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -343,6 +348,7 @@
+@@ -343,6 +349,7 @@
  %if %{build_userspace}
  
@@ -30,5 +31,5 @@
  
  %if %{fedorakmod}
-@@ -403,6 +409,7 @@
+@@ -403,6 +410,7 @@
  
  %if %{build_authlibs}
@@ -38,5 +39,5 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +426,7 @@
+@@ -419,6 +427,7 @@
  %endif
  
@@ -46,5 +47,5 @@
  Requires: openafs-authlibs = %{PACKAGE_VERSION}
  %endif
-@@ -437,6 +445,7 @@
+@@ -437,6 +446,7 @@
  libraries.
  
@@ -54,5 +55,5 @@
  Group: Development/Filesystems
  
-@@ -465,6 +474,7 @@
+@@ -465,6 +475,7 @@
  administrators.
  
@@ -62,5 +63,5 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{PACKAGE_VERSION}
-@@ -514,6 +524,7 @@
+@@ -514,6 +525,7 @@
  
  %if %{krb5support}
@@ -70,5 +71,5 @@
  Requires: openafs = %{PACKAGE_VERSION}
  Group: Networking/Filesystems
-@@ -540,7 +551,7 @@
+@@ -540,7 +552,7 @@
  %if %{build_modules}
  
@@ -79,5 +80,5 @@
  %else
  
-@@ -699,6 +710,10 @@
+@@ -699,6 +711,11 @@
  
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
@@ -87,4 +88,5 @@
 +%patch1002 -p1 -b .pts-encrypt
 +%patch1003 -p1 -b .localcsdb
++%patch1004 -p1 -b .dprintf
  
  ##############################################################################