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

Last change on this file since 2335 was 2335, checked in by geofft, 12 years ago
Create patch for current openafs-stable-1_6_x as fake 1.6.1.1 Create a single large patch containing the diff between the 1.6.1 release and a new openafs-stable_1_6_1_1-branch, which was made from a rebase of openafs-stable-1_6_x onto openafs-stable-1_6_1-branch. We continue to revert the things reverted in 1.6.1, including "offline-less vos release". This patch supersedes three of the patches we previously cherry-picked. This allows us to compile on Linux 3.6. In order to make this work, we run ./regen.sh (= autoreconf) in the build process. Consider removing this once we get back to closely tracking an actual OpenAFS release. The actual git branch is in openafs-stable-1_6_1_1-branch on https://github.com/sipb/openafs (also in w-e:/home/scripts-build/openafs).
File size: 3.5 KB
RevLine 
[2335]1--- openafs.spec.orig   2012-11-10 05:22:28.754019405 -0500
2+++ openafs.spec        2012-11-10 12:45:48.679334955 -0500
3@@ -1,10 +1,10 @@
4 # Openafs Spec $Revision$
5 
6 %define afsvers 1.6.1
7-%define pkgvers 1.6.1
8+%define pkgvers 1.6.1.1
[2066]9 # for beta/rc releases make pkgrel 0.<tag>
[925]10 # for real releases make pkgrel 1 (or more for extra releases)
[2066]11-%define pkgrel 1
12+%define pkgrel 1.99.scripts.%{scriptsversion}
[925]13 
[2066]14 %{!?fedorakmod: %define fedorakmod 1}
15 %{!?build_dkmspkg: %define build_dkmspkg 1}
[2335]16@@ -249,9 +249,16 @@
17 %if %{build_modules}
18 BuildRequires: kernel-devel
19 %endif
20+BuildRequires: libtool
[2066]21 
[760]22 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
23 
[2335]24+Patch999:  openafs-stable-1.6.1.1.patch
[1]25+Patch1000: openafs-scripts.patch
[2335]26+Patch1001: openafs-systemd-crond.patch
27+Patch1002: openafs-systemd-csdb.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
[2288]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}
[2288]39 %if 0%{?fedora} >= 15
40 Requires: systemd-units
41@@ -403,6 +411,7 @@
[925]42 
43 %if %{build_authlibs}
44 %package authlibs
45+Provides: scripts-openafs-authlibs
46 Summary: OpenAFS authentication shared libraries
47 Group: Networking/Filesystems
48 
[2288]49@@ -419,6 +428,7 @@
[925]50 %endif
51 
52 %package authlibs-devel
53+Provides: scripts-openafs-authlibs-devel
54 %if %{build_authlibs}
[2066]55 Requires: openafs-authlibs = %{version}-%{release}
[925]56 %endif
[2288]57@@ -437,6 +447,7 @@
[925]58 libraries.
59 
60 %package devel
61+Provides: scripts-openafs-devel
62 Summary: OpenAFS Development Libraries and Headers
63 Group: Development/Filesystems
[2066]64 Requires: openafs = %{version}-%{release}
[2288]65@@ -466,6 +477,7 @@
[925]66 administrators.
67 
68 %package kernel-source
69+Provides: scripts-openafs-kernel-source
70 Summary: OpenAFS Kernel Module source tree
71 Group: Networking/Filesystems
[1693]72 Provides: openafs-kernel = %{version}
[2288]73@@ -515,6 +527,7 @@
[925]74 
75 %if %{krb5support}
76 %package krb5
77+Provides: scripts-openafs-krb5
78 Summary: OpenAFS programs to use with krb5
[1693]79 Requires: openafs = %{version}
[925]80 Group: Networking/Filesystems
[2288]81@@ -541,7 +554,7 @@
[929]82 %if %{build_modules}
83 
84 %if %{fedorakmod}
85-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
86+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
87 
88 %else
89 
[2335]90@@ -698,6 +711,12 @@
[2066]91 #%setup -q -n %{srcdir}
92 %setup -q -b 1 -n %{srcdir}
[925]93 
[2066]94+# Apply the Scripts patch
[2335]95+%patch999  -p1 -b .1.6.1.1
[760]96+%patch1000 -p1 -b .scripts
[2335]97+%patch1001 -p1 -b .systemd-crond
98+%patch1002 -p1 -b .systemd-csdb
[2066]99+
[760]100 ##############################################################################
101 #
[2066]102 # building
[2335]103@@ -869,6 +888,8 @@
104 %endif
105 %endif
106 
107+./regen.sh
108+
109 ./configure --with-afs-sysname=${sysname} \
110        --prefix=%{_prefix} \
111        --libdir=%{_libdir} \
[2288]112@@ -1278,6 +1299,13 @@
[2066]113 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
114 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
115 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
116+%else
117+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
118+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
119+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
120+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
121+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
122+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
123 %endif
124 
125 %endif
Note: See TracBrowser for help on using the repository browser.