source: branches/fc15-dev/server/fedora/specs/openafs.spec.patch @ 2060

Last change on this file since 2060 was 2060, checked in by ezyang, 12 years ago
Backport OpenAFS patches to make it work with Linux 3.1
File size: 3.2 KB
RevLine 
[2060]1--- rpmbuild/SPECS/openafs.spec
2+++ rpmbuild/SPECS/openafs.spec.~3~     2011-11-20 20:13:52.211673609 -0500
[1913]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)
[2011]7-%define pkgrel 1
8+%define pkgrel 1.99.scripts.%{scriptsversion}
[925]9 
[1913]10 %{!?fedorakmod: %define fedorakmod 1}
11 %{!?build_dkmspkg: %define build_dkmspkg 1}
[2060]12@@ -237,6 +237,13 @@
13 
[760]14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
15 
[1]16+Patch1000: openafs-scripts.patch
[1914]17+Patch1001: openafs-localcsdb.patch
[2011]18+Patch1002: openafs-systemd.patch
19+Patch1003: openafs-systemd-crond.patch
[2060]20+Patch1004: openafs-linux-3.1-rcu.patch
21+Patch1005: openafs-linux-3.1-fsync.patch
[1]22+
23 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
24 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
25 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
[2060]26@@ -316,6 +323,7 @@
[925]27 %if %{build_userspace}
[1]28 
[925]29 %package client
30+Provides: scripts-openafs-client
[1693]31 Requires: binutils, openafs = %{version}
[925]32 
33 %if %{fedorakmod}
[2060]34@@ -376,6 +384,7 @@
[925]35 
36 %if %{build_authlibs}
37 %package authlibs
38+Provides: scripts-openafs-authlibs
39 Summary: OpenAFS authentication shared libraries
40 Group: Networking/Filesystems
41 
[2060]42@@ -392,6 +401,7 @@
[925]43 %endif
44 
45 %package authlibs-devel
46+Provides: scripts-openafs-authlibs-devel
47 %if %{build_authlibs}
[2060]48 Requires: openafs-authlibs = %{version}-%{release}
[925]49 %endif
[2060]50@@ -410,6 +420,7 @@
[925]51 libraries.
52 
53 %package devel
54+Provides: scripts-openafs-devel
55 Summary: OpenAFS Development Libraries and Headers
56 Group: Development/Filesystems
[2060]57 Requires: openafs = %{version}-%{release}
58@@ -439,6 +450,7 @@
[925]59 administrators.
60 
61 %package kernel-source
62+Provides: scripts-openafs-kernel-source
63 Summary: OpenAFS Kernel Module source tree
64 Group: Networking/Filesystems
[1693]65 Provides: openafs-kernel = %{version}
[2060]66@@ -488,6 +500,7 @@
[925]67 
68 %if %{krb5support}
69 %package krb5
70+Provides: scripts-openafs-krb5
71 Summary: OpenAFS programs to use with krb5
[1693]72 Requires: openafs = %{version}
[925]73 Group: Networking/Filesystems
[2060]74@@ -514,7 +527,7 @@
[929]75 %if %{build_modules}
76 
77 %if %{fedorakmod}
78-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
79+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
80 
81 %else
82 
[2060]83@@ -671,6 +684,14 @@
[1913]84 #%setup -q -n %{srcdir}
85 %setup -q -b 1 -n %{srcdir}
[925]86 
[1913]87+# Apply the Scripts patch
[760]88+%patch1000 -p1 -b .scripts
[1914]89+%patch1001 -p1 -b .localcsdb
[2011]90+%patch1002 -p1 -b .systemd
91+%patch1003 -p1 -b .systemd-crond
[2060]92+%patch1004 -p1 -b .rcu
93+%patch1005 -p1 -b .fsync
[1913]94+
[760]95 ##############################################################################
96 #
[1913]97 # building
[2060]98@@ -1212,6 +1233,13 @@
[1913]99 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
100 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
101 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
102+%else
103+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
104+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
105+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
106+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
107+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
108+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
109 %endif
110 
111 %endif
Note: See TracBrowser for help on using the repository browser.