Changeset 1139


Ignore:
Timestamp:
Jun 3, 2009, 6:33:03 AM (12 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:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev/server/fedora/specs/openafs.spec.patch

    r1079 r1139  
    1 --- openafs.spec.orig   2009-04-08 08:17:00.000000000 -0400
    2 +++ openafs.spec        2009-04-14 04:32:44.000000000 -0400
     1--- openafs.spec.orig   2009-06-03 04:16:03.000000000 -0400
     2+++ openafs.spec        2009-06-03 04:18:10.000000000 -0400
    33@@ -8,7 +8,7 @@
    44 # for beta/rc releases make pkgrel 0.X.<tag>
     
    1010 %if %{?osvers:0}%{!?osvers:1}
    1111 %define osvers 1
    12 @@ -261,6 +261,11 @@
     12@@ -261,6 +261,12 @@
    1313 %endif
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
     
    1818+Patch1002: openafs-pts-encrypt.patch
    1919+Patch1003: openafs-localcsdb.patch
     20+Patch1004: openafs-delta-dprintf-rename-20090427.patch
    2021+
    2122 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    2223 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2324 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    24 @@ -343,6 +348,7 @@
     25@@ -343,6 +349,7 @@
    2526 %if %{build_userspace}
    2627 
     
    3031 
    3132 %if %{fedorakmod}
    32 @@ -403,6 +409,7 @@
     33@@ -403,6 +410,7 @@
    3334 
    3435 %if %{build_authlibs}
     
    3839 Group: Networking/Filesystems
    3940 
    40 @@ -419,6 +426,7 @@
     41@@ -419,6 +427,7 @@
    4142 %endif
    4243 
     
    4647 Requires: openafs-authlibs = %{PACKAGE_VERSION}
    4748 %endif
    48 @@ -437,6 +445,7 @@
     49@@ -437,6 +446,7 @@
    4950 libraries.
    5051 
     
    5455 Group: Development/Filesystems
    5556 
    56 @@ -465,6 +474,7 @@
     57@@ -465,6 +475,7 @@
    5758 administrators.
    5859 
     
    6263 Group: Networking/Filesystems
    6364 Provides: openafs-kernel = %{PACKAGE_VERSION}
    64 @@ -514,6 +524,7 @@
     65@@ -514,6 +525,7 @@
    6566 
    6667 %if %{krb5support}
     
    7071 Requires: openafs = %{PACKAGE_VERSION}
    7172 Group: Networking/Filesystems
    72 @@ -540,7 +551,7 @@
     73@@ -540,7 +552,7 @@
    7374 %if %{build_modules}
    7475 
     
    7980 %else
    8081 
    81 @@ -699,6 +710,10 @@
     82@@ -699,6 +711,11 @@
    8283 
    8384 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
     
    8788+%patch1002 -p1 -b .pts-encrypt
    8889+%patch1003 -p1 -b .localcsdb
     90+%patch1004 -p1 -b .dprintf
    8991 
    9092 ##############################################################################
Note: See TracChangeset for help on using the changeset viewer.