Changeset 1139 for branches

Timestamp:

Jun 3, 2009, 6:33:03 AM (16 years ago)

Author:

mitchb

Message:

Apply OpenAFS delta dprintf-rename-20090427
Renames the dpatch #define, which conflicts in Fedora 11

Location:

branches/fc11-dev/server

Files:

• common/patches/openafs-delta-dprintf-rename-20090427.patch (added)
• fedora/specs/openafs.spec.patch (modified) (11 diffs)

branches/fc11-dev/server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- 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 +10 @@
  %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 +18 @@
 +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 +31 @@
  
  %if %{fedorakmod}
-@@ -403,6 +409,7 @@
+@@ -403,6 +410,7 @@
  
  %if %{build_authlibs}
@@ -38 +39 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +426,7 @@
+@@ -419,6 +427,7 @@
  %endif
  
@@ -46 +47 @@
  Requires: openafs-authlibs = %{PACKAGE_VERSION}
  %endif
-@@ -437,6 +445,7 @@
+@@ -437,6 +446,7 @@
  libraries.
  
@@ -54 +55 @@
  Group: Development/Filesystems
  
-@@ -465,6 +474,7 @@
+@@ -465,6 +475,7 @@
  administrators.
  
@@ -62 +63 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{PACKAGE_VERSION}
-@@ -514,6 +524,7 @@
+@@ -514,6 +525,7 @@
  
  %if %{krb5support}
@@ -70 +71 @@
  Requires: openafs = %{PACKAGE_VERSION}
  Group: Networking/Filesystems
-@@ -540,7 +551,7 @@
+@@ -540,7 +552,7 @@
  %if %{build_modules}
  
@@ -79 +80 @@
  %else
  
-@@ -699,6 +710,10 @@
+@@ -699,6 +711,11 @@
  
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
@@ -87 +88 @@
 +%patch1002 -p1 -b .pts-encrypt
 +%patch1003 -p1 -b .localcsdb
++%patch1004 -p1 -b .dprintf
  
  ##############################################################################