| [2591] | 1 | --- openafs.spec.orig   2014-05-25 21:15:54.539027644 -0400 | 
|---|
|  | 2 | +++ openafs.spec        2014-05-25 21:16:27.836268275 -0400 | 
|---|
| [2337] | 3 | @@ -4,7 +4,7 @@ | 
|---|
| [2615] | 4 | %define pkgvers 1.6.10 | 
|---|
| [2066] | 5 | # for beta/rc releases make pkgrel 0.<tag> | 
|---|
| [925] | 6 | # for real releases make pkgrel 1 (or more for extra releases) | 
|---|
| [2637] | 7 | -%define pkgrel 2 | 
|---|
|  | 8 | +%define pkgrel 2.99.scripts.%{scriptsversion} | 
|---|
| [925] | 9 |  | 
|---|
| [2066] | 10 | %{!?fedorakmod: %define fedorakmod 1} | 
|---|
|  | 11 | %{!?build_dkmspkg: %define build_dkmspkg 1} | 
|---|
| [2639] | 12 | @@ -249,9 +249,18 @@ | 
|---|
| [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 | 
|---|
| [2637] | 23 | +Patch1004: openafs-afs_lookup-return.patch | 
|---|
|  | 24 | +Patch1005: openafs-d_revalidate-mtpt.patch | 
|---|
| [2639] | 25 | +Patch1006: openafs-linux-3.17.patch | 
|---|
| [2288] | 26 | +%define _default_patch_fuzz 2 | 
|---|
| [1] | 27 | + | 
|---|
|  | 28 | #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... | 
|---|
|  | 29 | Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 | 
|---|
|  | 30 | Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 | 
|---|
| [2633] | 31 | @@ -331,6 +338,7 @@ | 
|---|
| [925] | 32 | %if %{build_userspace} | 
|---|
| [1] | 33 |  | 
|---|
| [925] | 34 | %package client | 
|---|
|  | 35 | +Provides: scripts-openafs-client | 
|---|
| [1693] | 36 | Requires: binutils, openafs = %{version} | 
|---|
| [2591] | 37 | %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 | 
|---|
| [2288] | 38 | Requires: systemd-units | 
|---|
| [2633] | 39 | @@ -382,6 +390,7 @@ | 
|---|
| [2376] | 40 | %package -n dkms-%{name} | 
|---|
|  | 41 | Summary:        DKMS-ready kernel source for AFS distributed filesystem | 
|---|
|  | 42 | Group:          Development/Kernel | 
|---|
|  | 43 | +Provides:       scripts-dkms-%{name} | 
|---|
|  | 44 | Provides:       openafs-kernel = %{version} | 
|---|
|  | 45 | %if %{fedorakmod} | 
|---|
|  | 46 | Provides: %{name}-kmod = %{version} | 
|---|
| [2633] | 47 | @@ -403,6 +412,7 @@ | 
|---|
| [925] | 48 |  | 
|---|
|  | 49 | %if %{build_authlibs} | 
|---|
|  | 50 | %package authlibs | 
|---|
|  | 51 | +Provides: scripts-openafs-authlibs | 
|---|
|  | 52 | Summary: OpenAFS authentication shared libraries | 
|---|
|  | 53 | Group: Networking/Filesystems | 
|---|
|  | 54 |  | 
|---|
| [2633] | 55 | @@ -419,6 +429,7 @@ | 
|---|
| [925] | 56 | %endif | 
|---|
|  | 57 |  | 
|---|
|  | 58 | %package authlibs-devel | 
|---|
|  | 59 | +Provides: scripts-openafs-authlibs-devel | 
|---|
|  | 60 | %if %{build_authlibs} | 
|---|
| [2066] | 61 | Requires: openafs-authlibs = %{version}-%{release} | 
|---|
| [925] | 62 | %endif | 
|---|
| [2633] | 63 | @@ -437,6 +448,7 @@ | 
|---|
| [925] | 64 | libraries. | 
|---|
|  | 65 |  | 
|---|
|  | 66 | %package devel | 
|---|
|  | 67 | +Provides: scripts-openafs-devel | 
|---|
|  | 68 | Summary: OpenAFS Development Libraries and Headers | 
|---|
|  | 69 | Group: Development/Filesystems | 
|---|
| [2066] | 70 | Requires: openafs = %{version}-%{release} | 
|---|
| [2633] | 71 | @@ -466,6 +478,7 @@ | 
|---|
| [925] | 72 | administrators. | 
|---|
|  | 73 |  | 
|---|
|  | 74 | %package kernel-source | 
|---|
|  | 75 | +Provides: scripts-openafs-kernel-source | 
|---|
|  | 76 | Summary: OpenAFS Kernel Module source tree | 
|---|
|  | 77 | Group: Networking/Filesystems | 
|---|
| [1693] | 78 | Provides: openafs-kernel = %{version} | 
|---|
| [2633] | 79 | @@ -515,6 +528,7 @@ | 
|---|
| [925] | 80 |  | 
|---|
|  | 81 | %if %{krb5support} | 
|---|
|  | 82 | %package krb5 | 
|---|
|  | 83 | +Provides: scripts-openafs-krb5 | 
|---|
|  | 84 | Summary: OpenAFS programs to use with krb5 | 
|---|
| [1693] | 85 | Requires: openafs = %{version} | 
|---|
| [925] | 86 | Group: Networking/Filesystems | 
|---|
| [2633] | 87 | @@ -541,7 +555,7 @@ | 
|---|
| [929] | 88 | %if %{build_modules} | 
|---|
|  | 89 |  | 
|---|
|  | 90 | %if %{fedorakmod} | 
|---|
| [2615] | 91 | -%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{depmod} %{kvariants} 2>/dev/null)} | 
|---|
|  | 92 | +%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{depmod} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)} | 
|---|
| [929] | 93 |  | 
|---|
|  | 94 | %else | 
|---|
|  | 95 |  | 
|---|
| [2639] | 96 | @@ -698,6 +712,14 @@ | 
|---|
| [2066] | 97 | #%setup -q -n %{srcdir} | 
|---|
|  | 98 | %setup -q -b 1 -n %{srcdir} | 
|---|
| [925] | 99 |  | 
|---|
| [2066] | 100 | +# Apply the Scripts patch | 
|---|
| [760] | 101 | +%patch1000 -p1 -b .scripts | 
|---|
| [2337] | 102 | +%patch1002 -p1 -b .systemd-crond | 
|---|
|  | 103 | +%patch1003 -p1 -b .systemd-csdb | 
|---|
| [2637] | 104 | +%patch1004 -p1 -b .afs_lookup-return | 
|---|
| [2639] | 105 | +%patch1005 -p1 -b .d_revalidate-mtpt | 
|---|
|  | 106 | +%patch1006 -p1 -b .linux-3.17 | 
|---|
| [2066] | 107 | + | 
|---|
| [760] | 108 | ############################################################################## | 
|---|
|  | 109 | # | 
|---|
| [2066] | 110 | # building | 
|---|
| [2633] | 111 | @@ -871,6 +891,8 @@ | 
|---|
| [2335] | 112 | %endif | 
|---|
|  | 113 | %endif | 
|---|
|  | 114 |  | 
|---|
|  | 115 | +./regen.sh | 
|---|
|  | 116 | + | 
|---|
|  | 117 | ./configure --with-afs-sysname=${sysname} \ | 
|---|
|  | 118 | --prefix=%{_prefix} \ | 
|---|
|  | 119 | --libdir=%{_libdir} \ | 
|---|
| [2633] | 120 | @@ -1267,6 +1289,13 @@ | 
|---|
| [2066] | 121 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
|  | 122 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
|  | 123 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
|  | 124 | +%else | 
|---|
|  | 125 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so | 
|---|
|  | 126 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
|  | 127 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
|  | 128 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
|  | 129 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so | 
|---|
|  | 130 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* | 
|---|
|  | 131 | %endif | 
|---|
|  | 132 |  | 
|---|
|  | 133 | %endif | 
|---|