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