Index: branches/fc15-dev/server/common/patches/openafs-localcsdb.patch
===================================================================
--- branches/fc15-dev/server/common/patches/openafs-localcsdb.patch	(revision 1914)
+++ branches/fc15-dev/server/common/patches/openafs-localcsdb.patch	(revision 1914)
@@ -0,0 +1,11 @@
+--- openafs-1.4/src/packaging/RedHat/openafs-client.init.orig	2009-04-14 04:28:32.000000000 -0400
++++ openafs-1.4/src/packaging/RedHat/openafs-client.init	2009-04-14 04:27:08.000000000 -0400
+@@ -14,7 +14,7 @@
+ 
+ start() {
+         echo -n $"Updating CellServDB: "
+-        cat /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist > \
++        cat /usr/vice/etc/CellServDB.local > \
+                /usr/vice/etc/CellServDB
+         chmod 644 /usr/vice/etc/CellServDB
+         echo
Index: branches/fc15-dev/server/common/patches/openafs-scripts.patch
===================================================================
--- branches/fc15-dev/server/common/patches/openafs-scripts.patch	(revision 1913)
+++ branches/fc15-dev/server/common/patches/openafs-scripts.patch	(revision 1914)
@@ -270,15 +270,2 @@
      if (!afs_resourceinit_flag)	/* afs daemons haven't started yet */
  	return EIO;		/* Inappropriate ioctl for device */
-diff --git a/src/packaging/RedHat/openafs-client.init b/src/packaging/RedHat/openafs-client.init
-index 10ec647..a4ecbc8 100644
---- a/src/packaging/RedHat/openafs-client.init
-+++ b/src/packaging/RedHat/openafs-client.init
-@@ -14,7 +14,7 @@
- 
- start() {
-         echo -n $"Updating CellServDB: "
--        cat /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist > \
-+        cat /usr/vice/etc/CellServDB.local > \
-                /usr/vice/etc/CellServDB
-         chmod 644 /usr/vice/etc/CellServDB
-         echo
Index: branches/fc15-dev/server/fedora/specs/openafs.spec.patch
===================================================================
--- branches/fc15-dev/server/fedora/specs/openafs.spec.patch	(revision 1913)
+++ branches/fc15-dev/server/fedora/specs/openafs.spec.patch	(revision 1914)
@@ -1,4 +1,4 @@
 --- openafs.spec.orig	2011-06-20 15:32:57.000000000 -0400
-+++ openafs.spec	2011-06-20 17:45:49.000000000 -0400
++++ openafs.spec	2011-06-21 17:15:24.000000000 -0400
 @@ -4,7 +4,7 @@
  %define pkgvers 1.6.0
@@ -10,14 +10,15 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -247,6 +247,8 @@
+@@ -247,6 +247,9 @@
  %endif
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
  
 +Patch1000: openafs-scripts.patch
++Patch1001: openafs-localcsdb.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
-@@ -326,6 +328,7 @@
+@@ -326,6 +329,7 @@
  %if %{build_userspace}
  
@@ -27,5 +28,5 @@
  
  %if %{fedorakmod}
-@@ -386,6 +389,7 @@
+@@ -386,6 +390,7 @@
  
  %if %{build_authlibs}
@@ -35,5 +36,5 @@
  Group: Networking/Filesystems
  
-@@ -402,6 +406,7 @@
+@@ -402,6 +407,7 @@
  %endif
  
@@ -43,5 +44,5 @@
  Requires: openafs-authlibs = %{version}
  %endif
-@@ -420,6 +425,7 @@
+@@ -420,6 +426,7 @@
  libraries.
  
@@ -51,5 +52,5 @@
  Group: Development/Filesystems
  
-@@ -448,6 +454,7 @@
+@@ -448,6 +455,7 @@
  administrators.
  
@@ -59,5 +60,5 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -497,6 +504,7 @@
+@@ -497,6 +505,7 @@
  
  %if %{krb5support}
@@ -67,5 +68,5 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -523,7 +531,7 @@
+@@ -523,7 +532,7 @@
  %if %{build_modules}
  
@@ -76,5 +77,5 @@
  %else
  
-@@ -680,6 +688,9 @@
+@@ -680,6 +689,10 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -82,9 +83,10 @@
 +# Apply the Scripts patch
 +%patch1000 -p1 -b .scripts
++%patch1001 -p1 -b .localcsdb
 +
  ##############################################################################
  #
  # building
-@@ -1215,6 +1226,13 @@
+@@ -1215,6 +1228,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*