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

Last change on this file since 1913 was 1913, checked in by achernya, 13 years ago
Update OpenAFS from 1.4.14 to 1.6.0pre6 kaduk finished porting the openafs-scripts patch to 1.6.0, which was then lightly modified be me to get it to compile -- mostly fixing typos. The openafs.spec.patch was also fixed, including another chmod +x hack on some libraries to get rpm to properly process them for Provides directives. Interestingly, these libraries had the correct mode in 1.4.14. The patches that were added to get 1.4.14 to compile have also been removed, as 1.6.0pre6 compiles on kernel 2.6.38 unmodified. openafs-numsysnames is getting removed because 32 is now the default. openafs-localcsdb is getting removed because the change was included in kaduk's patchset.
File size: 2.8 KB
RevLine 
[1913]1--- openafs.spec.orig   2011-06-20 15:32:57.000000000 -0400
2+++ openafs.spec        2011-06-20 17:45:49.000000000 -0400
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)
[1913]7-%define pkgrel 0.pre6
8+%define pkgrel 0.pre6.99.scripts.%{scriptsversion}
[925]9 
[1913]10 %{!?fedorakmod: %define fedorakmod 1}
11 %{!?build_dkmspkg: %define build_dkmspkg 1}
12@@ -247,6 +247,8 @@
[760]13 %endif
14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
15 
[1]16+Patch1000: openafs-scripts.patch
17+
18 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
19 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
20 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
[1913]21@@ -326,6 +328,7 @@
[925]22 %if %{build_userspace}
[1]23 
[925]24 %package client
25+Provides: scripts-openafs-client
[1693]26 Requires: binutils, openafs = %{version}
[925]27 
28 %if %{fedorakmod}
[1913]29@@ -386,6 +389,7 @@
[925]30 
31 %if %{build_authlibs}
32 %package authlibs
33+Provides: scripts-openafs-authlibs
34 Summary: OpenAFS authentication shared libraries
35 Group: Networking/Filesystems
36 
[1913]37@@ -402,6 +406,7 @@
[925]38 %endif
39 
40 %package authlibs-devel
41+Provides: scripts-openafs-authlibs-devel
42 %if %{build_authlibs}
[1693]43 Requires: openafs-authlibs = %{version}
[925]44 %endif
[1913]45@@ -420,6 +425,7 @@
[925]46 libraries.
47 
48 %package devel
49+Provides: scripts-openafs-devel
50 Summary: OpenAFS Development Libraries and Headers
51 Group: Development/Filesystems
52 
[1913]53@@ -448,6 +454,7 @@
[925]54 administrators.
55 
56 %package kernel-source
57+Provides: scripts-openafs-kernel-source
58 Summary: OpenAFS Kernel Module source tree
59 Group: Networking/Filesystems
[1693]60 Provides: openafs-kernel = %{version}
[1913]61@@ -497,6 +504,7 @@
[925]62 
63 %if %{krb5support}
64 %package krb5
65+Provides: scripts-openafs-krb5
66 Summary: OpenAFS programs to use with krb5
[1693]67 Requires: openafs = %{version}
[925]68 Group: Networking/Filesystems
[1913]69@@ -523,7 +531,7 @@
[929]70 %if %{build_modules}
71 
72 %if %{fedorakmod}
73-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
74+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
75 
76 %else
77 
[1913]78@@ -680,6 +688,9 @@
79 #%setup -q -n %{srcdir}
80 %setup -q -b 1 -n %{srcdir}
[925]81 
[1913]82+# Apply the Scripts patch
[760]83+%patch1000 -p1 -b .scripts
[1913]84+
[760]85 ##############################################################################
86 #
[1913]87 # building
88@@ -1215,6 +1226,13 @@
89 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
90 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
91 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
92+%else
93+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
94+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
95+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
96+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
97+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
98+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
99 %endif
100 
101 %endif
Note: See TracBrowser for help on using the repository browser.