close Warning: Can't use blame annotator: 
svn blame failed on branches/fc15-dev/server/fedora/specs/openafs.spec.patch: 28 - Can't close file '/tmp/svn-ULBEtj': No space left on device

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

Last change on this file since 2100 was 2062, checked in by geofft, 14 years ago
openafs: One last patch for Linux 3.1 support Marc Dionne says, "other than that I don't see anything missing in 1.6 for 3.1". Taken from http://gerrit.openafs.org/6104
File size: 3.3 KB
RevLine 
1--- rpmbuild/SPECS/openafs.spec
2+++ rpmbuild/SPECS/openafs.spec.~3~     2011-11-20 20:13:52.211673609 -0500
3@@ -4,7 +4,7 @@
4 %define pkgvers 1.6.0
5 # for beta/rc releases make pkgrel 0.<tag>
6 # for real releases make pkgrel 1 (or more for extra releases)
7-%define pkgrel 1
8+%define pkgrel 1.99.scripts.%{scriptsversion}
9 
10 %{!?fedorakmod: %define fedorakmod 1}
11 %{!?build_dkmspkg: %define build_dkmspkg 1}
12@@ -237,6 +237,14 @@
13 
14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
15 
16+Patch1000: openafs-scripts.patch
17+Patch1001: openafs-localcsdb.patch
18+Patch1002: openafs-systemd.patch
19+Patch1003: openafs-systemd-crond.patch
20+Patch1004: openafs-linux-3.1-rcu.patch
21+Patch1005: openafs-linux-3.1-fsync.patch
22+Patch1006: openafs-linux-3.1-zalloc.patch
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
27@@ -316,6 +324,7 @@
28 %if %{build_userspace}
29 
30 %package client
31+Provides: scripts-openafs-client
32 Requires: binutils, openafs = %{version}
33 
34 %if %{fedorakmod}
35@@ -376,6 +385,7 @@
36 
37 %if %{build_authlibs}
38 %package authlibs
39+Provides: scripts-openafs-authlibs
40 Summary: OpenAFS authentication shared libraries
41 Group: Networking/Filesystems
42 
43@@ -392,6 +402,7 @@
44 %endif
45 
46 %package authlibs-devel
47+Provides: scripts-openafs-authlibs-devel
48 %if %{build_authlibs}
49 Requires: openafs-authlibs = %{version}-%{release}
50 %endif
51@@ -410,6 +421,7 @@
52 libraries.
53 
54 %package devel
55+Provides: scripts-openafs-devel
56 Summary: OpenAFS Development Libraries and Headers
57 Group: Development/Filesystems
58 Requires: openafs = %{version}-%{release}
59@@ -439,6 +451,7 @@
60 administrators.
61 
62 %package kernel-source
63+Provides: scripts-openafs-kernel-source
64 Summary: OpenAFS Kernel Module source tree
65 Group: Networking/Filesystems
66 Provides: openafs-kernel = %{version}
67@@ -488,6 +501,7 @@
68 
69 %if %{krb5support}
70 %package krb5
71+Provides: scripts-openafs-krb5
72 Summary: OpenAFS programs to use with krb5
73 Requires: openafs = %{version}
74 Group: Networking/Filesystems
75@@ -514,7 +528,7 @@
76 %if %{build_modules}
77 
78 %if %{fedorakmod}
79-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
80+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
81 
82 %else
83 
84@@ -671,6 +685,15 @@
85 #%setup -q -n %{srcdir}
86 %setup -q -b 1 -n %{srcdir}
87 
88+# Apply the Scripts patch
89+%patch1000 -p1 -b .scripts
90+%patch1001 -p1 -b .localcsdb
91+%patch1002 -p1 -b .systemd
92+%patch1003 -p1 -b .systemd-crond
93+%patch1004 -p1 -b .rcu
94+%patch1005 -p1 -b .fsync
95+%patch1006 -p1 -b .zalloc
96+
97 ##############################################################################
98 #
99 # building
100@@ -1212,6 +1235,13 @@
101 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
102 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
103 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
104+%else
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}/libafsauthent.so.*
108+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
109+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
110+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
111 %endif
112 
113 %endif
Note: See TracBrowser for help on using the repository browser.