| [2335] | 1 | --- openafs.spec.orig   2012-11-10 05:22:28.754019405 -0500 | 
|---|
|  | 2 | +++ openafs.spec        2012-11-10 12:45:48.679334955 -0500 | 
|---|
| [2337] | 3 | @@ -4,7 +4,7 @@ | 
|---|
| [2371] | 4 | %define pkgvers 1.6.2 | 
|---|
| [2066] | 5 | # for beta/rc releases make pkgrel 0.<tag> | 
|---|
| [925] | 6 | # for real releases make pkgrel 1 (or more for extra releases) | 
|---|
| [2371] | 7 | -%define pkgrel 0.pre3 | 
|---|
|  | 8 | +%define pkgrel 0.pre3.99.scripts.%{scriptsversion} | 
|---|
| [925] | 9 |  | 
|---|
| [2066] | 10 | %{!?fedorakmod: %define fedorakmod 1} | 
|---|
|  | 11 | %{!?build_dkmspkg: %define build_dkmspkg 1} | 
|---|
| [2371] | 12 | @@ -249,9 +249,15 @@ | 
|---|
| [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 | 
|---|
| [2288] | 23 | +%define _default_patch_fuzz 2 | 
|---|
| [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 | 
|---|
| [2371] | 28 | @@ -331,6 +337,7 @@ | 
|---|
| [925] | 29 | %if %{build_userspace} | 
|---|
| [1] | 30 |  | 
|---|
| [925] | 31 | %package client | 
|---|
|  | 32 | +Provides: scripts-openafs-client | 
|---|
| [1693] | 33 | Requires: binutils, openafs = %{version} | 
|---|
| [2288] | 34 | %if 0%{?fedora} >= 15 | 
|---|
|  | 35 | Requires: systemd-units | 
|---|
| [2371] | 36 | @@ -403,6 +410,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 |  | 
|---|
| [2371] | 44 | @@ -419,6 +427,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 | 
|---|
| [2371] | 52 | @@ -437,6 +446,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} | 
|---|
| [2371] | 60 | @@ -466,6 +476,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} | 
|---|
| [2371] | 68 | @@ -515,6 +526,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 | 
|---|
| [2371] | 76 | @@ -541,7 +553,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 |  | 
|---|
| [2371] | 85 | @@ -698,6 +710,11 @@ | 
|---|
| [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 | 
|---|
| [2337] | 91 | +%patch1002 -p1 -b .systemd-crond | 
|---|
|  | 92 | +%patch1003 -p1 -b .systemd-csdb | 
|---|
| [2066] | 93 | + | 
|---|
| [760] | 94 | ############################################################################## | 
|---|
|  | 95 | # | 
|---|
| [2066] | 96 | # building | 
|---|
| [2371] | 97 | @@ -869,6 +886,8 @@ | 
|---|
| [2335] | 98 | %endif | 
|---|
|  | 99 | %endif | 
|---|
|  | 100 |  | 
|---|
|  | 101 | +./regen.sh | 
|---|
|  | 102 | + | 
|---|
|  | 103 | ./configure --with-afs-sysname=${sysname} \ | 
|---|
|  | 104 | --prefix=%{_prefix} \ | 
|---|
|  | 105 | --libdir=%{_libdir} \ | 
|---|
| [2371] | 106 | @@ -1278,6 +1297,13 @@ | 
|---|
| [2066] | 107 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
|  | 108 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
|  | 109 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
|  | 110 | +%else | 
|---|
|  | 111 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so | 
|---|
|  | 112 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so | 
|---|
|  | 113 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* | 
|---|
|  | 114 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* | 
|---|
|  | 115 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so | 
|---|
|  | 116 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* | 
|---|
|  | 117 | %endif | 
|---|
|  | 118 |  | 
|---|
|  | 119 | %endif | 
|---|