| [2448] | 1 | --- openafs.spec.orig   2013-06-24 04:40:31.000000000 -0400 | 
|---|
 | 2 | +++ openafs.spec        2013-07-18 22:43:10.631044261 -0400 | 
|---|
| [2337] | 3 | @@ -4,7 +4,7 @@ | 
|---|
| [2448] | 4 |  %define pkgvers 1.6.4 | 
|---|
| [2066] | 5 |  # for beta/rc releases make pkgrel 0.<tag> | 
|---|
| [925] | 6 |  # for real releases make pkgrel 1 (or more for extra releases) | 
|---|
| [2383] | 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} | 
|---|
| [2504] | 12 | @@ -249,9 +249,16 @@ | 
|---|
| [2335] | 13 |  %if %{build_modules} | 
|---|
 | 14 |  BuildRequires: kernel-devel | 
|---|
 | 15 |  %endif | 
|---|
 | 16 | +BuildRequires: libtool | 
|---|
| [2066] | 17 |   | 
|---|
| [760] | 18 |  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 | 
|---|
 | 19 |   | 
|---|
| [1] | 20 | +Patch1000: openafs-scripts.patch | 
|---|
| [2337] | 21 | +Patch1002: openafs-systemd-crond.patch | 
|---|
 | 22 | +Patch1003: openafs-systemd-csdb.patch | 
|---|
| [2504] | 23 | +Patch1004: openafs-d_drop.patch | 
|---|
| [2288] | 24 | +%define _default_patch_fuzz 2 | 
|---|
| [1] | 25 | + | 
|---|
 | 26 |  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... | 
|---|
 | 27 |  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 | 
|---|
 | 28 |  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 | 
|---|
| [2448] | 29 | @@ -331,6 +337,7 @@ | 
|---|
| [925] | 30 |  %if %{build_userspace} | 
|---|
| [1] | 31 |   | 
|---|
| [925] | 32 |  %package client | 
|---|
 | 33 | +Provides: scripts-openafs-client | 
|---|
| [1693] | 34 |  Requires: binutils, openafs = %{version} | 
|---|
| [2288] | 35 |  %if 0%{?fedora} >= 15 | 
|---|
 | 36 |  Requires: systemd-units | 
|---|
| [2448] | 37 | @@ -382,6 +389,7 @@ | 
|---|
| [2376] | 38 |  %package -n dkms-%{name} | 
|---|
 | 39 |  Summary:        DKMS-ready kernel source for AFS distributed filesystem | 
|---|
 | 40 |  Group:          Development/Kernel | 
|---|
 | 41 | +Provides:       scripts-dkms-%{name} | 
|---|
 | 42 |  Provides:       openafs-kernel = %{version} | 
|---|
 | 43 |  %if %{fedorakmod} | 
|---|
 | 44 |  Provides: %{name}-kmod = %{version} | 
|---|
| [2448] | 45 | @@ -403,6 +411,7 @@ | 
|---|
| [925] | 46 |   | 
|---|
 | 47 |  %if %{build_authlibs} | 
|---|
 | 48 |  %package authlibs | 
|---|
 | 49 | +Provides: scripts-openafs-authlibs | 
|---|
 | 50 |  Summary: OpenAFS authentication shared libraries | 
|---|
 | 51 |  Group: Networking/Filesystems | 
|---|
 | 52 |   | 
|---|
| [2448] | 53 | @@ -419,6 +428,7 @@ | 
|---|
| [925] | 54 |  %endif | 
|---|
 | 55 |   | 
|---|
 | 56 |  %package authlibs-devel | 
|---|
 | 57 | +Provides: scripts-openafs-authlibs-devel | 
|---|
 | 58 |  %if %{build_authlibs} | 
|---|
| [2066] | 59 |  Requires: openafs-authlibs = %{version}-%{release} | 
|---|
| [925] | 60 |  %endif | 
|---|
| [2448] | 61 | @@ -437,6 +447,7 @@ | 
|---|
| [925] | 62 |  libraries. | 
|---|
 | 63 |   | 
|---|
 | 64 |  %package devel | 
|---|
 | 65 | +Provides: scripts-openafs-devel | 
|---|
 | 66 |  Summary: OpenAFS Development Libraries and Headers | 
|---|
 | 67 |  Group: Development/Filesystems | 
|---|
| [2066] | 68 |  Requires: openafs = %{version}-%{release} | 
|---|
| [2448] | 69 | @@ -466,6 +477,7 @@ | 
|---|
| [925] | 70 |  administrators. | 
|---|
 | 71 |   | 
|---|
 | 72 |  %package kernel-source | 
|---|
 | 73 | +Provides: scripts-openafs-kernel-source | 
|---|
 | 74 |  Summary: OpenAFS Kernel Module source tree | 
|---|
 | 75 |  Group: Networking/Filesystems | 
|---|
| [1693] | 76 |  Provides: openafs-kernel = %{version} | 
|---|
| [2448] | 77 | @@ -515,6 +527,7 @@ | 
|---|
| [925] | 78 |   | 
|---|
 | 79 |  %if %{krb5support} | 
|---|
 | 80 |  %package krb5 | 
|---|
 | 81 | +Provides: scripts-openafs-krb5 | 
|---|
 | 82 |  Summary: OpenAFS programs to use with krb5 | 
|---|
| [1693] | 83 |  Requires: openafs = %{version} | 
|---|
| [925] | 84 |  Group: Networking/Filesystems | 
|---|
| [2448] | 85 | @@ -541,7 +554,7 @@ | 
|---|
| [929] | 86 |  %if %{build_modules} | 
|---|
 | 87 |   | 
|---|
 | 88 |  %if %{fedorakmod} | 
|---|
 | 89 | -%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)} | 
|---|
 | 90 | +%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)} | 
|---|
 | 91 |   | 
|---|
 | 92 |  %else | 
|---|
 | 93 |   | 
|---|
| [2504] | 94 | @@ -698,6 +711,12 @@ | 
|---|
| [2066] | 95 |  #%setup -q -n %{srcdir} | 
|---|
 | 96 |  %setup -q -b 1 -n %{srcdir} | 
|---|
| [925] | 97 |   | 
|---|
| [2066] | 98 | +# Apply the Scripts patch | 
|---|
| [760] | 99 | +%patch1000 -p1 -b .scripts | 
|---|
| [2337] | 100 | +%patch1002 -p1 -b .systemd-crond | 
|---|
 | 101 | +%patch1003 -p1 -b .systemd-csdb | 
|---|
| [2504] | 102 | +%patch1004 -p1 -b .d_drop | 
|---|
| [2066] | 103 | + | 
|---|
| [760] | 104 |  ############################################################################## | 
|---|
 | 105 |  # | 
|---|
| [2066] | 106 |  # building | 
|---|
| [2448] | 107 | @@ -869,6 +887,8 @@ | 
|---|
| [2335] | 108 |  %endif | 
|---|
 | 109 |  %endif | 
|---|
 | 110 |   | 
|---|
 | 111 | +./regen.sh | 
|---|
 | 112 | + | 
|---|
 | 113 |  ./configure --with-afs-sysname=${sysname} \ | 
|---|
 | 114 |         --prefix=%{_prefix} \ | 
|---|
 | 115 |         --libdir=%{_libdir} \ | 
|---|
| [2448] | 116 | @@ -1257,6 +1277,13 @@ | 
|---|
| [2066] | 117 |  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
 | 118 |  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
 | 119 |  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
 | 120 | +%else | 
|---|
 | 121 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so | 
|---|
 | 122 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
 | 123 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
 | 124 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
 | 125 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so | 
|---|
 | 126 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* | 
|---|
 | 127 |  %endif | 
|---|
 | 128 |   | 
|---|
 | 129 |  %endif | 
|---|