| [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 @@ | 
|---|
| [2659] | 4 | %define pkgvers 1.6.11 | 
|---|
| [2066] | 5 | # for beta/rc releases make pkgrel 0.<tag> | 
|---|
| [925] | 6 | # for real releases make pkgrel 1 (or more for extra releases) | 
|---|
| [2671] | 7 | -%define pkgrel 0.pre2 | 
|---|
|  | 8 | +%define pkgrel 0.pre2.99.scripts.%{scriptsversion} | 
|---|
| [925] | 9 |  | 
|---|
| [2066] | 10 | %{!?fedorakmod: %define fedorakmod 1} | 
|---|
|  | 11 | %{!?build_dkmspkg: %define build_dkmspkg 1} | 
|---|
| [2671] | 12 | @@ -249,9 +249,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 | 
|---|
| [2633] | 27 | @@ -331,6 +338,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 | 
|---|
| [2633] | 35 | @@ -382,6 +390,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} | 
|---|
| [2633] | 43 | @@ -403,6 +412,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 |  | 
|---|
| [2633] | 51 | @@ -419,6 +429,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 | 
|---|
| [2633] | 59 | @@ -437,6 +448,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} | 
|---|
| [2633] | 67 | @@ -466,6 +478,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} | 
|---|
| [2633] | 75 | @@ -515,6 +528,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 | 
|---|
| [2633] | 83 | @@ -541,7 +555,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 |  | 
|---|
| [2671] | 92 | @@ -698,6 +712,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 | 
|---|
| [2633] | 103 | @@ -871,6 +891,8 @@ | 
|---|
| [2335] | 104 | %endif | 
|---|
|  | 105 | %endif | 
|---|
|  | 106 |  | 
|---|
|  | 107 | +./regen.sh | 
|---|
|  | 108 | + | 
|---|
|  | 109 | ./configure --with-afs-sysname=${sysname} \ | 
|---|
|  | 110 | --prefix=%{_prefix} \ | 
|---|
|  | 111 | --libdir=%{_libdir} \ | 
|---|
| [2633] | 112 | @@ -1267,6 +1289,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 | 
|---|