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

Last change on this file since 1327 was 1274, checked in by mitchb, 14 years ago
Upgrade OpenAFS to 1.4.11 o Two of our patches (postinit and pts-encrypt) have been upstreamed o Two deltas we applied (dprintf-rename-20090427 and linux26-defer-cred-changing-20090511) are now included in this version o The scripts patch has some context adjustments o Our spec file patch corrects an upstream bug which tries to install a compile_et manpage, which conflicts with e2fsprogs-devel
File size: 3.0 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
[1274]12@@ -261,6 +261,10 @@
[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
[1]19+
20 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
21 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
22 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
[1274]23@@ -343,6 +347,7 @@
[925]24 %if %{build_userspace}
[1]25 
[925]26 %package client
27+Provides: scripts-openafs-client
28 Requires: binutils, openafs = %{PACKAGE_VERSION}
29 
30 %if %{fedorakmod}
[1274]31@@ -403,6 +408,7 @@
[925]32 
33 %if %{build_authlibs}
34 %package authlibs
35+Provides: scripts-openafs-authlibs
36 Summary: OpenAFS authentication shared libraries
37 Group: Networking/Filesystems
38 
[1274]39@@ -419,6 +425,7 @@
[925]40 %endif
41 
42 %package authlibs-devel
43+Provides: scripts-openafs-authlibs-devel
44 %if %{build_authlibs}
45 Requires: openafs-authlibs = %{PACKAGE_VERSION}
46 %endif
[1274]47@@ -437,6 +444,7 @@
[925]48 libraries.
49 
50 %package devel
51+Provides: scripts-openafs-devel
52 Summary: OpenAFS Development Libraries and Headers
53 Group: Development/Filesystems
54 
[1274]55@@ -465,6 +473,7 @@
[925]56 administrators.
57 
58 %package kernel-source
59+Provides: scripts-openafs-kernel-source
60 Summary: OpenAFS Kernel Module source tree
61 Group: Networking/Filesystems
62 Provides: openafs-kernel = %{PACKAGE_VERSION}
[1274]63@@ -514,6 +523,7 @@
[925]64 
65 %if %{krb5support}
66 %package krb5
67+Provides: scripts-openafs-krb5
68 Summary: OpenAFS programs to use with krb5
69 Requires: openafs = %{PACKAGE_VERSION}
70 Group: Networking/Filesystems
[1274]71@@ -540,7 +550,7 @@
[929]72 %if %{build_modules}
73 
74 %if %{fedorakmod}
75-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
76+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
77 
78 %else
79 
[1274]80@@ -699,6 +709,9 @@
[925]81 
[1]82 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
83 %patch0 -p1 -b .kmod26
[760]84+%patch1000 -p1 -b .scripts
[1079]85+%patch1003 -p1 -b .localcsdb
[1259]86+%patch1005 -p1 -b .numsysnames
[1]87 
[760]88 ##############################################################################
89 #
[1274]90@@ -1209,7 +1222,7 @@
91 rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*
92 
93 # remove man pages from programs deleted above
94-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
95+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
96   rm -f $RPM_BUILD_ROOT%{_mandir}/man$f.*
97 done
98 
99@@ -1569,7 +1582,6 @@
100 %{_libdir}/librxstat.a
101 %{_libdir}/libubik.a
102 %{_mandir}/man1/rxgen.*
103-%{_mandir}/man1/compile_et.*
104 
105 %if %{build_dkmspkg}
106 %files -n dkms-%{name}
Note: See TracBrowser for help on using the repository browser.