| [1693] | 1 | --- openafs.spec.orig   2010-09-10 18:21:53.000000000 -0400 | 
|---|
|  | 2 | +++ openafs.spec        2010-09-10 18:34:30.000000000 -0400 | 
|---|
| [925] | 3 | @@ -8,7 +8,7 @@ | 
|---|
|  | 4 | # for beta/rc releases make pkgrel 0.X.<tag> | 
|---|
|  | 5 | # for real releases make pkgrel 1 (or more for extra releases) | 
|---|
|  | 6 | #%define pkgrel 0.1.rc1 | 
|---|
| [1835] | 7 | -%define pkgrel 1.1 | 
|---|
|  | 8 | +%define pkgrel 1.1.99scripts.%{scriptsversion} | 
|---|
| [925] | 9 |  | 
|---|
|  | 10 | %if %{?osvers:0}%{!?osvers:1} | 
|---|
|  | 11 | %define osvers 1 | 
|---|
| [1835] | 12 | @@ -261,6 +261,19 @@ | 
|---|
| [760] | 13 | %endif | 
|---|
|  | 14 | ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 | 
|---|
|  | 15 |  | 
|---|
| [1] | 16 | +Patch1000: openafs-scripts.patch | 
|---|
| [1079] | 17 | +Patch1003: openafs-localcsdb.patch | 
|---|
| [1259] | 18 | +Patch1005: openafs-numsysnames.patch | 
|---|
| [1835] | 19 | +Patch1006: openafs-0001-Linux-Add-autoconf-macro-for-structure-checks.patch | 
|---|
|  | 20 | +Patch1007: openafs-0002-Linux-Add-general-autoconf-macro-for-Linux-kernel.patch | 
|---|
|  | 21 | +Patch1008: openafs-0003-Linux-allow-compile-flags-to-be-passed-to-AC_CHECK_L.patch | 
|---|
|  | 22 | +Patch1009: openafs-0004-Linux-2.6.38-Adjust-for-permission-inode-operation-c.patch | 
|---|
|  | 23 | +Patch1010: openafs-0005-linux-2.6.38-New-d_op-handling.patch | 
|---|
|  | 24 | +Patch1011: openafs-0006-linux-2.6.38-Make-d_revalidate-RCU-walk-aware.patch | 
|---|
|  | 25 | +Patch1012: openafs-0007-Linux-2.6.38-deal-with-dcache_lock-removal.patch | 
|---|
|  | 26 | +Patch1013: openafs-0008-Linux-2.6.38-dentry-d_count-is-not-an-atomic.patch | 
|---|
|  | 27 | +Patch1014: openafs-0009-fix-broken-earlier.patch | 
|---|
| [1] | 28 | + | 
|---|
|  | 29 | #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... | 
|---|
|  | 30 | Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 | 
|---|
|  | 31 | Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 | 
|---|
| [1693] | 32 | @@ -343,6 +347,7 @@ | 
|---|
| [925] | 33 | %if %{build_userspace} | 
|---|
| [1] | 34 |  | 
|---|
| [925] | 35 | %package client | 
|---|
|  | 36 | +Provides: scripts-openafs-client | 
|---|
| [1693] | 37 | Requires: binutils, openafs = %{version} | 
|---|
| [925] | 38 |  | 
|---|
|  | 39 | %if %{fedorakmod} | 
|---|
| [1693] | 40 | @@ -403,6 +408,7 @@ | 
|---|
| [925] | 41 |  | 
|---|
|  | 42 | %if %{build_authlibs} | 
|---|
|  | 43 | %package authlibs | 
|---|
|  | 44 | +Provides: scripts-openafs-authlibs | 
|---|
|  | 45 | Summary: OpenAFS authentication shared libraries | 
|---|
|  | 46 | Group: Networking/Filesystems | 
|---|
|  | 47 |  | 
|---|
| [1693] | 48 | @@ -419,6 +425,7 @@ | 
|---|
| [925] | 49 | %endif | 
|---|
|  | 50 |  | 
|---|
|  | 51 | %package authlibs-devel | 
|---|
|  | 52 | +Provides: scripts-openafs-authlibs-devel | 
|---|
|  | 53 | %if %{build_authlibs} | 
|---|
| [1693] | 54 | Requires: openafs-authlibs = %{version} | 
|---|
| [925] | 55 | %endif | 
|---|
| [1693] | 56 | @@ -437,6 +444,7 @@ | 
|---|
| [925] | 57 | libraries. | 
|---|
|  | 58 |  | 
|---|
|  | 59 | %package devel | 
|---|
|  | 60 | +Provides: scripts-openafs-devel | 
|---|
|  | 61 | Summary: OpenAFS Development Libraries and Headers | 
|---|
|  | 62 | Group: Development/Filesystems | 
|---|
|  | 63 |  | 
|---|
| [1693] | 64 | @@ -465,6 +473,7 @@ | 
|---|
| [925] | 65 | administrators. | 
|---|
|  | 66 |  | 
|---|
|  | 67 | %package kernel-source | 
|---|
|  | 68 | +Provides: scripts-openafs-kernel-source | 
|---|
|  | 69 | Summary: OpenAFS Kernel Module source tree | 
|---|
|  | 70 | Group: Networking/Filesystems | 
|---|
| [1693] | 71 | Provides: openafs-kernel = %{version} | 
|---|
|  | 72 | @@ -514,6 +523,7 @@ | 
|---|
| [925] | 73 |  | 
|---|
|  | 74 | %if %{krb5support} | 
|---|
|  | 75 | %package krb5 | 
|---|
|  | 76 | +Provides: scripts-openafs-krb5 | 
|---|
|  | 77 | Summary: OpenAFS programs to use with krb5 | 
|---|
| [1693] | 78 | Requires: openafs = %{version} | 
|---|
| [925] | 79 | Group: Networking/Filesystems | 
|---|
| [1693] | 80 | @@ -540,7 +550,7 @@ | 
|---|
| [929] | 81 | %if %{build_modules} | 
|---|
|  | 82 |  | 
|---|
|  | 83 | %if %{fedorakmod} | 
|---|
|  | 84 | -%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)} | 
|---|
|  | 85 | +%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)} | 
|---|
|  | 86 |  | 
|---|
|  | 87 | %else | 
|---|
|  | 88 |  | 
|---|
| [1835] | 89 | @@ -699,6 +709,18 @@ | 
|---|
| [925] | 90 |  | 
|---|
| [1] | 91 | # Patch openafs to build a kernel module named "openafs" instead of "libafs" | 
|---|
|  | 92 | %patch0 -p1 -b .kmod26 | 
|---|
| [760] | 93 | +%patch1000 -p1 -b .scripts | 
|---|
| [1079] | 94 | +%patch1003 -p1 -b .localcsdb | 
|---|
| [1259] | 95 | +%patch1005 -p1 -b .numsysnames | 
|---|
| [1835] | 96 | +%patch1006 -p1 -b .0001 | 
|---|
|  | 97 | +%patch1007 -p1 -b .0002 | 
|---|
|  | 98 | +%patch1008 -p1 -b .0003 | 
|---|
|  | 99 | +%patch1009 -p1 -b .0004 | 
|---|
|  | 100 | +%patch1010 -p1 -b .0005 | 
|---|
|  | 101 | +%patch1011 -p1 -b .0006 | 
|---|
|  | 102 | +%patch1012 -p1 -b .0007 | 
|---|
|  | 103 | +%patch1013 -p1 -b .0008 | 
|---|
|  | 104 | +%patch1014 -p1 -b .0009 | 
|---|
| [1] | 105 |  | 
|---|
| [760] | 106 | ############################################################################## | 
|---|
|  | 107 | # | 
|---|
| [1836] | 108 | @@ -1140,7 +1140,6 @@ | 
|---|
|  | 109 | %{_bindir}/bos | 
|---|
|  | 110 | %{_bindir}/fs | 
|---|
|  | 111 | %{_bindir}/kapasswd | 
|---|
|  | 112 | -%{_bindir}/kpasswd | 
|---|
|  | 113 | %{_bindir}/klog | 
|---|
|  | 114 | %{_bindir}/klog.krb | 
|---|
|  | 115 | %{_bindir}/pagsh | 
|---|
|  | 116 |  | 
|---|