source: trunk/server/fedora/specs/openafs.spec.patch @ 1613

Last change on this file since 1613 was 1555, checked in by mitchb, 12 years ago
There can be only one! (so stop hogging the GLOCK) OpenAFS 1.4.12 had bogus "lost connection" messages, which went away when we rolled back to 1.4.11. However, we're now occasionally having hard lockups because readdir deadlocks waiting for the GLOCK when filldir is holding it and pagefaults. Apply 829838e45f94921d22335154587216f7842e3955 from upstream as a compromise until we can move into the future with OpenAFS 1.5
File size: 3.1 KB
RevLine 
[1274]1--- openafs.spec.orig
2+++ openafs.spec
[925]3@@ -8,7 +8,7 @@
4 # for beta/rc releases make pkgrel 0.X.<tag>
5 # for real releases make pkgrel 1 (or more for extra releases)
6 #%define pkgrel 0.1.rc1
7-%define pkgrel 1.1
[930]8+%define pkgrel 1.1.99scripts.%{scriptsversion}
[925]9 
10 %if %{?osvers:0}%{!?osvers:1}
11 %define osvers 1
[1555]12@@ -261,6 +261,11 @@
[760]13 %endif
14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
15 
[1]16+Patch1000: openafs-scripts.patch
[1079]17+Patch1003: openafs-localcsdb.patch
[1259]18+Patch1005: openafs-numsysnames.patch
[1555]19+Patch1006: openafs-release-glock.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
[1555]24@@ -343,6 +348,7 @@
[925]25 %if %{build_userspace}
[1]26 
[925]27 %package client
28+Provides: scripts-openafs-client
29 Requires: binutils, openafs = %{PACKAGE_VERSION}
30 
31 %if %{fedorakmod}
[1555]32@@ -403,6 +409,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 
[1555]40@@ -419,6 +426,7 @@
[925]41 %endif
42 
43 %package authlibs-devel
44+Provides: scripts-openafs-authlibs-devel
45 %if %{build_authlibs}
46 Requires: openafs-authlibs = %{PACKAGE_VERSION}
47 %endif
[1555]48@@ -437,6 +445,7 @@
[925]49 libraries.
50 
51 %package devel
52+Provides: scripts-openafs-devel
53 Summary: OpenAFS Development Libraries and Headers
54 Group: Development/Filesystems
55 
[1555]56@@ -465,6 +474,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
63 Provides: openafs-kernel = %{PACKAGE_VERSION}
[1555]64@@ -514,6 +524,7 @@
[925]65 
66 %if %{krb5support}
67 %package krb5
68+Provides: scripts-openafs-krb5
69 Summary: OpenAFS programs to use with krb5
70 Requires: openafs = %{PACKAGE_VERSION}
71 Group: Networking/Filesystems
[1555]72@@ -540,7 +551,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 
[1555]81@@ -699,6 +710,10 @@
[925]82 
[1]83 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
84 %patch0 -p1 -b .kmod26
[760]85+%patch1000 -p1 -b .scripts
[1079]86+%patch1003 -p1 -b .localcsdb
[1259]87+%patch1005 -p1 -b .numsysnames
[1555]88+%patch1006 -p1 -b .release-glock
[1]89 
[760]90 ##############################################################################
91 #
[1555]92@@ -1209,7 +1224,7 @@
[1545]93 rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*
94 
95 # remove man pages from programs deleted above
96-for f in 1/dlog 1/dpass 1/livesys 1/xstat_cm_test 1/xstat_fs_test 8/kdb 8/kpwvalid 8/xfs_size_check 1/package_test 5/package 8/package ; do
97+for f in 1/compile_et 1/dlog 1/dpass 1/livesys 1/xstat_cm_test 1/xstat_fs_test 8/kdb 8/kpwvalid 8/xfs_size_check 1/package_test 5/package 8/package ; do
98   rm -f $RPM_BUILD_ROOT%{_mandir}/man$f.*
99 done
100 
[1555]101@@ -1569,7 +1584,6 @@
[1545]102 %{_libdir}/librxstat.a
103 %{_libdir}/libubik.a
104 %{_mandir}/man1/rxgen.*
105-%{_mandir}/man1/compile_et.*
106 
107 %if %{build_dkmspkg}
108 %files -n dkms-%{name}
Note: See TracBrowser for help on using the repository browser.