[2195] | 1 | --- openafs.spec 2012-02-13 15:41:02.757592190 -0500 |
---|
| 2 | +++ openafs.spec.~3~ 2012-02-13 15:48:25.366294629 -0500 |
---|
[2066] | 3 | @@ -4,7 +4,7 @@ |
---|
| 4 | %define pkgvers 1.6.0 |
---|
| 5 | # for beta/rc releases make pkgrel 0.<tag> |
---|
[925] | 6 | # for real releases make pkgrel 1 (or more for extra releases) |
---|
[2066] | 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} |
---|
[2202] | 12 | @@ -237,6 +237,11 @@ |
---|
[2066] | 13 | |
---|
[760] | 14 | ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 |
---|
| 15 | |
---|
[1] | 16 | +Patch1000: openafs-scripts.patch |
---|
[2202] | 17 | +Patch1001: openafs-systemd-remote-fs.patch |
---|
[2195] | 18 | +Patch1002: openafs-systemd-crond.patch |
---|
| 19 | +Patch1003: openafs-systemd-csdb.patch |
---|
[1] | 20 | + |
---|
| 21 | # http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... |
---|
| 22 | Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 |
---|
| 23 | Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 |
---|
[2195] | 24 | @@ -316,6 +325,7 @@ |
---|
[925] | 25 | %if %{build_userspace} |
---|
[1] | 26 | |
---|
[925] | 27 | %package client |
---|
| 28 | +Provides: scripts-openafs-client |
---|
[1693] | 29 | Requires: binutils, openafs = %{version} |
---|
[925] | 30 | |
---|
| 31 | %if %{fedorakmod} |
---|
[2195] | 32 | @@ -376,6 +386,7 @@ |
---|
[925] | 33 | |
---|
| 34 | %if %{build_authlibs} |
---|
| 35 | %package authlibs |
---|
| 36 | +Provides: scripts-openafs-authlibs |
---|
| 37 | Summary: OpenAFS authentication shared libraries |
---|
| 38 | Group: Networking/Filesystems |
---|
| 39 | |
---|
[2195] | 40 | @@ -392,6 +403,7 @@ |
---|
[925] | 41 | %endif |
---|
| 42 | |
---|
| 43 | %package authlibs-devel |
---|
| 44 | +Provides: scripts-openafs-authlibs-devel |
---|
| 45 | %if %{build_authlibs} |
---|
[2066] | 46 | Requires: openafs-authlibs = %{version}-%{release} |
---|
[925] | 47 | %endif |
---|
[2195] | 48 | @@ -410,6 +422,7 @@ |
---|
[925] | 49 | libraries. |
---|
| 50 | |
---|
| 51 | %package devel |
---|
| 52 | +Provides: scripts-openafs-devel |
---|
| 53 | Summary: OpenAFS Development Libraries and Headers |
---|
| 54 | Group: Development/Filesystems |
---|
[2066] | 55 | Requires: openafs = %{version}-%{release} |
---|
[2195] | 56 | @@ -439,6 +452,7 @@ |
---|
[925] | 57 | administrators. |
---|
| 58 | |
---|
| 59 | %package kernel-source |
---|
| 60 | +Provides: scripts-openafs-kernel-source |
---|
| 61 | Summary: OpenAFS Kernel Module source tree |
---|
| 62 | Group: Networking/Filesystems |
---|
[1693] | 63 | Provides: openafs-kernel = %{version} |
---|
[2195] | 64 | @@ -488,6 +502,7 @@ |
---|
[925] | 65 | |
---|
| 66 | %if %{krb5support} |
---|
| 67 | %package krb5 |
---|
| 68 | +Provides: scripts-openafs-krb5 |
---|
| 69 | Summary: OpenAFS programs to use with krb5 |
---|
[1693] | 70 | Requires: openafs = %{version} |
---|
[925] | 71 | Group: Networking/Filesystems |
---|
[2195] | 72 | @@ -514,7 +529,7 @@ |
---|
[929] | 73 | %if %{build_modules} |
---|
| 74 | |
---|
| 75 | %if %{fedorakmod} |
---|
| 76 | -%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)} |
---|
| 77 | +%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)} |
---|
| 78 | |
---|
| 79 | %else |
---|
| 80 | |
---|
[2202] | 81 | @@ -671,6 +686,12 @@ |
---|
[2066] | 82 | #%setup -q -n %{srcdir} |
---|
| 83 | %setup -q -b 1 -n %{srcdir} |
---|
[925] | 84 | |
---|
[2066] | 85 | +# Apply the Scripts patch |
---|
[760] | 86 | +%patch1000 -p1 -b .scripts |
---|
[2202] | 87 | +%patch1001 -p1 -b .systemd-remote-fs |
---|
[2195] | 88 | +%patch1002 -p1 -b .systemd-crond |
---|
| 89 | +%patch1003 -p1 -b .systemd-csdb |
---|
[2066] | 90 | + |
---|
[760] | 91 | ############################################################################## |
---|
| 92 | # |
---|
[2066] | 93 | # building |
---|
[2195] | 94 | @@ -1212,6 +1237,13 @@ |
---|
[2066] | 95 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so |
---|
| 96 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* |
---|
| 97 | rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* |
---|
| 98 | +%else |
---|
| 99 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so |
---|
| 100 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so |
---|
| 101 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* |
---|
| 102 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* |
---|
| 103 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so |
---|
| 104 | +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* |
---|
| 105 | %endif |
---|
| 106 | |
---|
| 107 | %endif |
---|