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

Last change on this file since 2651 was 2649, checked in by andersk, 10 years ago
openafs: Fix some afs_conn overcounts Patch from http://gerrit.openafs.org/11464 .
File size: 4.0 KB
RevLine 
[2591]1--- openafs.spec.orig   2014-05-25 21:15:54.539027644 -0400
2+++ openafs.spec        2014-05-25 21:16:27.836268275 -0400
[2337]3@@ -4,7 +4,7 @@
[2615]4 %define pkgvers 1.6.10
[2066]5 # for beta/rc releases make pkgrel 0.<tag>
[925]6 # for real releases make pkgrel 1 (or more for extra releases)
[2637]7-%define pkgrel 2
8+%define pkgrel 2.99.scripts.%{scriptsversion}
[925]9 
[2066]10 %{!?fedorakmod: %define fedorakmod 1}
11 %{!?build_dkmspkg: %define build_dkmspkg 1}
[2649]12@@ -249,9 +249,20 @@
[2335]13 %if %{build_modules}
14 BuildRequires: kernel-devel
15 %endif
16+BuildRequires: libtool
[2066]17 
[760]18 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
19 
[1]20+Patch1000: openafs-scripts.patch
[2337]21+Patch1002: openafs-systemd-crond.patch
22+Patch1003: openafs-systemd-csdb.patch
[2637]23+Patch1004: openafs-afs_lookup-return.patch
24+Patch1005: openafs-d_revalidate-mtpt.patch
[2639]25+Patch1006: openafs-linux-3.17.patch
[2644]26+Patch1007: openafs-mvid-NULL-deref.patch
[2649]27+Patch1008: openafs-afs_conn-overcounts.patch
[2288]28+%define _default_patch_fuzz 2
[1]29+
30 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
31 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
32 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
[2633]33@@ -331,6 +338,7 @@
[925]34 %if %{build_userspace}
[1]35 
[925]36 %package client
37+Provides: scripts-openafs-client
[1693]38 Requires: binutils, openafs = %{version}
[2591]39 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
[2288]40 Requires: systemd-units
[2633]41@@ -382,6 +390,7 @@
[2376]42 %package -n dkms-%{name}
43 Summary:        DKMS-ready kernel source for AFS distributed filesystem
44 Group:          Development/Kernel
45+Provides:       scripts-dkms-%{name}
46 Provides:       openafs-kernel = %{version}
47 %if %{fedorakmod}
48 Provides: %{name}-kmod = %{version}
[2633]49@@ -403,6 +412,7 @@
[925]50 
51 %if %{build_authlibs}
52 %package authlibs
53+Provides: scripts-openafs-authlibs
54 Summary: OpenAFS authentication shared libraries
55 Group: Networking/Filesystems
56 
[2633]57@@ -419,6 +429,7 @@
[925]58 %endif
59 
60 %package authlibs-devel
61+Provides: scripts-openafs-authlibs-devel
62 %if %{build_authlibs}
[2066]63 Requires: openafs-authlibs = %{version}-%{release}
[925]64 %endif
[2633]65@@ -437,6 +448,7 @@
[925]66 libraries.
67 
68 %package devel
69+Provides: scripts-openafs-devel
70 Summary: OpenAFS Development Libraries and Headers
71 Group: Development/Filesystems
[2066]72 Requires: openafs = %{version}-%{release}
[2633]73@@ -466,6 +478,7 @@
[925]74 administrators.
75 
76 %package kernel-source
77+Provides: scripts-openafs-kernel-source
78 Summary: OpenAFS Kernel Module source tree
79 Group: Networking/Filesystems
[1693]80 Provides: openafs-kernel = %{version}
[2633]81@@ -515,6 +528,7 @@
[925]82 
83 %if %{krb5support}
84 %package krb5
85+Provides: scripts-openafs-krb5
86 Summary: OpenAFS programs to use with krb5
[1693]87 Requires: openafs = %{version}
[925]88 Group: Networking/Filesystems
[2633]89@@ -541,7 +555,7 @@
[929]90 %if %{build_modules}
91 
92 %if %{fedorakmod}
[2615]93-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{depmod} %{kvariants} 2>/dev/null)}
94+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{depmod} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
[929]95 
96 %else
97 
[2649]98@@ -698,6 +712,16 @@
[2066]99 #%setup -q -n %{srcdir}
100 %setup -q -b 1 -n %{srcdir}
[925]101 
[2066]102+# Apply the Scripts patch
[760]103+%patch1000 -p1 -b .scripts
[2337]104+%patch1002 -p1 -b .systemd-crond
105+%patch1003 -p1 -b .systemd-csdb
[2637]106+%patch1004 -p1 -b .afs_lookup-return
[2639]107+%patch1005 -p1 -b .d_revalidate-mtpt
108+%patch1006 -p1 -b .linux-3.17
[2644]109+%patch1007 -p1 -b .mvid-NULL-deref.patch
[2649]110+%patch1008 -p1 -b .afs_conn-overcounts.patch
[2066]111+
[760]112 ##############################################################################
113 #
[2066]114 # building
[2633]115@@ -871,6 +891,8 @@
[2335]116 %endif
117 %endif
118 
119+./regen.sh
120+
121 ./configure --with-afs-sysname=${sysname} \
122        --prefix=%{_prefix} \
123        --libdir=%{_libdir} \
[2633]124@@ -1267,6 +1289,13 @@
[2066]125 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
126 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
127 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
128+%else
129+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
130+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
131+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
132+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
133+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
134+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
135 %endif
136 
137 %endif
Note: See TracBrowser for help on using the repository browser.