| [2195] | 1 | --- openafs.spec        2012-02-13 15:41:02.757592190 -0500 | 
|---|
|  | 2 | +++ openafs.spec.~3~    2012-02-13 15:48:25.366294629 -0500 | 
|---|
| [2066] | 3 | @@ -4,7 +4,7 @@ | 
|---|
|  | 4 | %define pkgvers 1.6.0 | 
|---|
|  | 5 | # for beta/rc releases make pkgrel 0.<tag> | 
|---|
| [925] | 6 | # for real releases make pkgrel 1 (or more for extra releases) | 
|---|
| [2066] | 7 | -%define pkgrel 1 | 
|---|
|  | 8 | +%define pkgrel 1.99.scripts.%{scriptsversion} | 
|---|
| [925] | 9 |  | 
|---|
| [2066] | 10 | %{!?fedorakmod: %define fedorakmod 1} | 
|---|
|  | 11 | %{!?build_dkmspkg: %define build_dkmspkg 1} | 
|---|
| [2195] | 12 | @@ -237,6 +237,15 @@ | 
|---|
| [2066] | 13 |  | 
|---|
| [760] | 14 | ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 | 
|---|
|  | 15 |  | 
|---|
| [1] | 16 | +Patch1000: openafs-scripts.patch | 
|---|
| [2195] | 17 | +Patch1001: openafs-systemd.patch | 
|---|
|  | 18 | +Patch1002: openafs-systemd-crond.patch | 
|---|
|  | 19 | +Patch1003: openafs-systemd-csdb.patch | 
|---|
| [2066] | 20 | +Patch1004: openafs-linux-3.1-rcu.patch | 
|---|
|  | 21 | +Patch1005: openafs-linux-3.1-fsync.patch | 
|---|
|  | 22 | +Patch1006: openafs-linux-3.1-zalloc.patch | 
|---|
| [2195] | 23 | +Patch1007: openafs-linux-3.2-nlink.patch | 
|---|
| [1] | 24 | + | 
|---|
|  | 25 | #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... | 
|---|
|  | 26 | Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 | 
|---|
|  | 27 | Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 | 
|---|
| [2195] | 28 | @@ -316,6 +325,7 @@ | 
|---|
| [925] | 29 | %if %{build_userspace} | 
|---|
| [1] | 30 |  | 
|---|
| [925] | 31 | %package client | 
|---|
|  | 32 | +Provides: scripts-openafs-client | 
|---|
| [1693] | 33 | Requires: binutils, openafs = %{version} | 
|---|
| [925] | 34 |  | 
|---|
|  | 35 | %if %{fedorakmod} | 
|---|
| [2195] | 36 | @@ -376,6 +386,7 @@ | 
|---|
| [925] | 37 |  | 
|---|
|  | 38 | %if %{build_authlibs} | 
|---|
|  | 39 | %package authlibs | 
|---|
|  | 40 | +Provides: scripts-openafs-authlibs | 
|---|
|  | 41 | Summary: OpenAFS authentication shared libraries | 
|---|
|  | 42 | Group: Networking/Filesystems | 
|---|
|  | 43 |  | 
|---|
| [2195] | 44 | @@ -392,6 +403,7 @@ | 
|---|
| [925] | 45 | %endif | 
|---|
|  | 46 |  | 
|---|
|  | 47 | %package authlibs-devel | 
|---|
|  | 48 | +Provides: scripts-openafs-authlibs-devel | 
|---|
|  | 49 | %if %{build_authlibs} | 
|---|
| [2066] | 50 | Requires: openafs-authlibs = %{version}-%{release} | 
|---|
| [925] | 51 | %endif | 
|---|
| [2195] | 52 | @@ -410,6 +422,7 @@ | 
|---|
| [925] | 53 | libraries. | 
|---|
|  | 54 |  | 
|---|
|  | 55 | %package devel | 
|---|
|  | 56 | +Provides: scripts-openafs-devel | 
|---|
|  | 57 | Summary: OpenAFS Development Libraries and Headers | 
|---|
|  | 58 | Group: Development/Filesystems | 
|---|
| [2066] | 59 | Requires: openafs = %{version}-%{release} | 
|---|
| [2195] | 60 | @@ -439,6 +452,7 @@ | 
|---|
| [925] | 61 | administrators. | 
|---|
|  | 62 |  | 
|---|
|  | 63 | %package kernel-source | 
|---|
|  | 64 | +Provides: scripts-openafs-kernel-source | 
|---|
|  | 65 | Summary: OpenAFS Kernel Module source tree | 
|---|
|  | 66 | Group: Networking/Filesystems | 
|---|
| [1693] | 67 | Provides: openafs-kernel = %{version} | 
|---|
| [2195] | 68 | @@ -488,6 +502,7 @@ | 
|---|
| [925] | 69 |  | 
|---|
|  | 70 | %if %{krb5support} | 
|---|
|  | 71 | %package krb5 | 
|---|
|  | 72 | +Provides: scripts-openafs-krb5 | 
|---|
|  | 73 | Summary: OpenAFS programs to use with krb5 | 
|---|
| [1693] | 74 | Requires: openafs = %{version} | 
|---|
| [925] | 75 | Group: Networking/Filesystems | 
|---|
| [2195] | 76 | @@ -514,7 +529,7 @@ | 
|---|
| [929] | 77 | %if %{build_modules} | 
|---|
|  | 78 |  | 
|---|
|  | 79 | %if %{fedorakmod} | 
|---|
|  | 80 | -%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)} | 
|---|
|  | 81 | +%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)} | 
|---|
|  | 82 |  | 
|---|
|  | 83 | %else | 
|---|
|  | 84 |  | 
|---|
| [2195] | 85 | @@ -671,6 +686,16 @@ | 
|---|
| [2066] | 86 | #%setup -q -n %{srcdir} | 
|---|
|  | 87 | %setup -q -b 1 -n %{srcdir} | 
|---|
| [925] | 88 |  | 
|---|
| [2066] | 89 | +# Apply the Scripts patch | 
|---|
| [760] | 90 | +%patch1000 -p1 -b .scripts | 
|---|
| [2195] | 91 | +%patch1001 -p1 -b .systemd | 
|---|
|  | 92 | +%patch1002 -p1 -b .systemd-crond | 
|---|
|  | 93 | +%patch1003 -p1 -b .systemd-csdb | 
|---|
| [2066] | 94 | +%patch1004 -p1 -b .rcu | 
|---|
|  | 95 | +%patch1005 -p1 -b .fsync | 
|---|
|  | 96 | +%patch1006 -p1 -b .zalloc | 
|---|
| [2195] | 97 | +%patch1007 -p1 -b .nlink | 
|---|
| [2066] | 98 | + | 
|---|
| [760] | 99 | ############################################################################## | 
|---|
|  | 100 | # | 
|---|
| [2066] | 101 | # building | 
|---|
| [2195] | 102 | @@ -1212,6 +1237,13 @@ | 
|---|
| [2066] | 103 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
|  | 104 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
|  | 105 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
|  | 106 | +%else | 
|---|
|  | 107 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so | 
|---|
|  | 108 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
|  | 109 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
|  | 110 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
|  | 111 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so | 
|---|
|  | 112 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* | 
|---|
|  | 113 | %endif | 
|---|
|  | 114 |  | 
|---|
|  | 115 | %endif | 
|---|