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

Last change on this file since 1914 was 1914, checked in by achernya, 13 years ago
Restore openafs-localcsdb.patch Mitch points out that the localcsdb patch was just Scripts configuration, and not actually relevant to the Scripts AFS patch. Therefore, the patch has been brought back, split out into a separte file as it was before.
File size: 2.9 KB
RevLine 
[1913]1--- openafs.spec.orig   2011-06-20 15:32:57.000000000 -0400
[1914]2+++ openafs.spec        2011-06-21 17:15:24.000000000 -0400
[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)
[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}
[1914]12@@ -247,6 +247,9 @@
[760]13 %endif
14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
15 
[1]16+Patch1000: openafs-scripts.patch
[1914]17+Patch1001: openafs-localcsdb.patch
[1]18+
19 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
20 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
21 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
[1914]22@@ -326,6 +329,7 @@
[925]23 %if %{build_userspace}
[1]24 
[925]25 %package client
26+Provides: scripts-openafs-client
[1693]27 Requires: binutils, openafs = %{version}
[925]28 
29 %if %{fedorakmod}
[1914]30@@ -386,6 +390,7 @@
[925]31 
32 %if %{build_authlibs}
33 %package authlibs
34+Provides: scripts-openafs-authlibs
35 Summary: OpenAFS authentication shared libraries
36 Group: Networking/Filesystems
37 
[1914]38@@ -402,6 +407,7 @@
[925]39 %endif
40 
41 %package authlibs-devel
42+Provides: scripts-openafs-authlibs-devel
43 %if %{build_authlibs}
[1693]44 Requires: openafs-authlibs = %{version}
[925]45 %endif
[1914]46@@ -420,6 +426,7 @@
[925]47 libraries.
48 
49 %package devel
50+Provides: scripts-openafs-devel
51 Summary: OpenAFS Development Libraries and Headers
52 Group: Development/Filesystems
53 
[1914]54@@ -448,6 +455,7 @@
[925]55 administrators.
56 
57 %package kernel-source
58+Provides: scripts-openafs-kernel-source
59 Summary: OpenAFS Kernel Module source tree
60 Group: Networking/Filesystems
[1693]61 Provides: openafs-kernel = %{version}
[1914]62@@ -497,6 +505,7 @@
[925]63 
64 %if %{krb5support}
65 %package krb5
66+Provides: scripts-openafs-krb5
67 Summary: OpenAFS programs to use with krb5
[1693]68 Requires: openafs = %{version}
[925]69 Group: Networking/Filesystems
[1914]70@@ -523,7 +532,7 @@
[929]71 %if %{build_modules}
72 
73 %if %{fedorakmod}
74-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
75+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
76 
77 %else
78 
[1914]79@@ -680,6 +689,10 @@
[1913]80 #%setup -q -n %{srcdir}
81 %setup -q -b 1 -n %{srcdir}
[925]82 
[1913]83+# Apply the Scripts patch
[760]84+%patch1000 -p1 -b .scripts
[1914]85+%patch1001 -p1 -b .localcsdb
[1913]86+
[760]87 ##############################################################################
88 #
[1913]89 # building
[1914]90@@ -1215,6 +1228,13 @@
[1913]91 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
92 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
93 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
94+%else
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}/libafsauthent.so.*
98+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
99+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
100+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
101 %endif
102 
103 %endif
Note: See TracBrowser for help on using the repository browser.