| [2712] | 1 | --- openafs.spec.orig   2015-06-25 05:18:38.000000000 -0400 | 
|---|
 | 2 | +++ openafs.spec        2015-07-13 21:41:31.196173273 -0400 | 
|---|
| [2337] | 3 | @@ -4,7 +4,7 @@ | 
|---|
| [2712] | 4 |  %define pkgvers 1.6.12 | 
|---|
| [2066] | 5 |  # for beta/rc releases make pkgrel 0.<tag> | 
|---|
| [925] | 6 |  # for real releases make pkgrel 1 (or more for extra releases) | 
|---|
| [2712] | 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} | 
|---|
| [2712] | 12 | @@ -255,9 +255,14 @@ | 
|---|
| [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 | +Patch1003: openafs-systemd-csdb.patch | 
|---|
| [2288] | 22 | +%define _default_patch_fuzz 2 | 
|---|
| [1] | 23 | + | 
|---|
 | 24 |  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... | 
|---|
 | 25 |  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 | 
|---|
 | 26 |  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 | 
|---|
| [2712] | 27 | @@ -337,6 +342,7 @@ | 
|---|
| [925] | 28 |  %if %{build_userspace} | 
|---|
| [1] | 29 |   | 
|---|
| [925] | 30 |  %package client | 
|---|
 | 31 | +Provides: scripts-openafs-client | 
|---|
| [1693] | 32 |  Requires: binutils, openafs = %{version} | 
|---|
| [2591] | 33 |  %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 | 
|---|
| [2288] | 34 |  Requires: systemd-units | 
|---|
| [2712] | 35 | @@ -388,6 +394,7 @@ | 
|---|
| [2376] | 36 |  %package -n dkms-%{name} | 
|---|
 | 37 |  Summary:        DKMS-ready kernel source for AFS distributed filesystem | 
|---|
 | 38 |  Group:          Development/Kernel | 
|---|
 | 39 | +Provides:       scripts-dkms-%{name} | 
|---|
 | 40 |  Provides:       openafs-kernel = %{version} | 
|---|
 | 41 |  %if %{fedorakmod} | 
|---|
 | 42 |  Provides: %{name}-kmod = %{version} | 
|---|
| [2712] | 43 | @@ -409,6 +416,7 @@ | 
|---|
| [925] | 44 |   | 
|---|
 | 45 |  %if %{build_authlibs} | 
|---|
 | 46 |  %package authlibs | 
|---|
 | 47 | +Provides: scripts-openafs-authlibs | 
|---|
 | 48 |  Summary: OpenAFS authentication shared libraries | 
|---|
 | 49 |  Group: Networking/Filesystems | 
|---|
 | 50 |   | 
|---|
| [2712] | 51 | @@ -425,6 +433,7 @@ | 
|---|
| [925] | 52 |  %endif | 
|---|
 | 53 |   | 
|---|
 | 54 |  %package authlibs-devel | 
|---|
 | 55 | +Provides: scripts-openafs-authlibs-devel | 
|---|
 | 56 |  %if %{build_authlibs} | 
|---|
| [2066] | 57 |  Requires: openafs-authlibs = %{version}-%{release} | 
|---|
| [925] | 58 |  %endif | 
|---|
| [2712] | 59 | @@ -443,6 +452,7 @@ | 
|---|
| [925] | 60 |  libraries. | 
|---|
 | 61 |   | 
|---|
 | 62 |  %package devel | 
|---|
 | 63 | +Provides: scripts-openafs-devel | 
|---|
 | 64 |  Summary: OpenAFS Development Libraries and Headers | 
|---|
 | 65 |  Group: Development/Filesystems | 
|---|
| [2066] | 66 |  Requires: openafs = %{version}-%{release} | 
|---|
| [2712] | 67 | @@ -472,6 +482,7 @@ | 
|---|
| [925] | 68 |  administrators. | 
|---|
 | 69 |   | 
|---|
 | 70 |  %package kernel-source | 
|---|
 | 71 | +Provides: scripts-openafs-kernel-source | 
|---|
 | 72 |  Summary: OpenAFS Kernel Module source tree | 
|---|
 | 73 |  Group: Networking/Filesystems | 
|---|
| [1693] | 74 |  Provides: openafs-kernel = %{version} | 
|---|
| [2712] | 75 | @@ -521,6 +532,7 @@ | 
|---|
| [925] | 76 |   | 
|---|
 | 77 |  %if %{krb5support} | 
|---|
 | 78 |  %package krb5 | 
|---|
 | 79 | +Provides: scripts-openafs-krb5 | 
|---|
 | 80 |  Summary: OpenAFS programs to use with krb5 | 
|---|
| [1693] | 81 |  Requires: openafs = %{version} | 
|---|
| [925] | 82 |  Group: Networking/Filesystems | 
|---|
| [2712] | 83 | @@ -547,7 +559,7 @@ | 
|---|
| [929] | 84 |  %if %{build_modules} | 
|---|
 | 85 |   | 
|---|
 | 86 |  %if %{fedorakmod} | 
|---|
| [2615] | 87 | -%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{depmod} %{kvariants} 2>/dev/null)} | 
|---|
 | 88 | +%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{depmod} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)} | 
|---|
| [929] | 89 |   | 
|---|
 | 90 |  %else | 
|---|
 | 91 |   | 
|---|
| [2712] | 92 | @@ -704,6 +716,10 @@ | 
|---|
| [2066] | 93 |  #%setup -q -n %{srcdir} | 
|---|
 | 94 |  %setup -q -b 1 -n %{srcdir} | 
|---|
| [925] | 95 |   | 
|---|
| [2066] | 96 | +# Apply the Scripts patch | 
|---|
| [760] | 97 | +%patch1000 -p1 -b .scripts | 
|---|
| [2337] | 98 | +%patch1003 -p1 -b .systemd-csdb | 
|---|
| [2066] | 99 | + | 
|---|
| [760] | 100 |  ############################################################################## | 
|---|
 | 101 |  # | 
|---|
| [2066] | 102 |  # building | 
|---|
| [2712] | 103 | @@ -877,6 +893,8 @@ | 
|---|
| [2335] | 104 |  %endif | 
|---|
 | 105 |  %endif | 
|---|
 | 106 |   | 
|---|
 | 107 | +./regen.sh | 
|---|
 | 108 | + | 
|---|
 | 109 |  ./configure --with-afs-sysname=${sysname} \ | 
|---|
 | 110 |         --prefix=%{_prefix} \ | 
|---|
 | 111 |         --libdir=%{_libdir} \ | 
|---|
| [2712] | 112 | @@ -1273,6 +1291,13 @@ | 
|---|
| [2066] | 113 |  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
 | 114 |  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
 | 115 |  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
 | 116 | +%else | 
|---|
 | 117 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so | 
|---|
 | 118 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
 | 119 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
 | 120 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
 | 121 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so | 
|---|
 | 122 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* | 
|---|
 | 123 |  %endif | 
|---|
 | 124 |   | 
|---|
 | 125 |  %endif | 
|---|