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

Last change on this file since 2337 was 2337, checked in by andersk, 11 years ago
Revert to OpenAFS 1.6.1 plus minimal patches for Linux 3.6
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
[2337]3@@ -4,7 +4,7 @@
4 %define pkgvers 1.6.1
[2066]5 # for beta/rc releases make pkgrel 0.<tag>
[925]6 # for real releases make pkgrel 1 (or more for extra releases)
[2066]7-%define pkgrel 1
8+%define pkgrel 1.99.scripts.%{scriptsversion}
[925]9 
[2066]10 %{!?fedorakmod: %define fedorakmod 1}
11 %{!?build_dkmspkg: %define build_dkmspkg 1}
[2337]12@@ -249,9 +249,17 @@
[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+Patch1001: openafs-systemd-remote-fs.patch
22+Patch1002: openafs-systemd-crond.patch
23+Patch1003: openafs-systemd-csdb.patch
24+Patch1004: openafs-linux-support.patch
[2288]25+%define _default_patch_fuzz 2
[1]26+
27 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
28 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
29 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
[2337]30@@ -331,6 +339,7 @@
[925]31 %if %{build_userspace}
[1]32 
[925]33 %package client
34+Provides: scripts-openafs-client
[1693]35 Requires: binutils, openafs = %{version}
[2288]36 %if 0%{?fedora} >= 15
37 Requires: systemd-units
[2337]38@@ -403,6 +412,7 @@
[925]39 
40 %if %{build_authlibs}
41 %package authlibs
42+Provides: scripts-openafs-authlibs
43 Summary: OpenAFS authentication shared libraries
44 Group: Networking/Filesystems
45 
[2337]46@@ -419,6 +429,7 @@
[925]47 %endif
48 
49 %package authlibs-devel
50+Provides: scripts-openafs-authlibs-devel
51 %if %{build_authlibs}
[2066]52 Requires: openafs-authlibs = %{version}-%{release}
[925]53 %endif
[2337]54@@ -437,6 +448,7 @@
[925]55 libraries.
56 
57 %package devel
58+Provides: scripts-openafs-devel
59 Summary: OpenAFS Development Libraries and Headers
60 Group: Development/Filesystems
[2066]61 Requires: openafs = %{version}-%{release}
[2337]62@@ -466,6 +478,7 @@
[925]63 administrators.
64 
65 %package kernel-source
66+Provides: scripts-openafs-kernel-source
67 Summary: OpenAFS Kernel Module source tree
68 Group: Networking/Filesystems
[1693]69 Provides: openafs-kernel = %{version}
[2337]70@@ -515,6 +528,7 @@
[925]71 
72 %if %{krb5support}
73 %package krb5
74+Provides: scripts-openafs-krb5
75 Summary: OpenAFS programs to use with krb5
[1693]76 Requires: openafs = %{version}
[925]77 Group: Networking/Filesystems
[2337]78@@ -541,7 +555,7 @@
[929]79 %if %{build_modules}
80 
81 %if %{fedorakmod}
82-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
83+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
84 
85 %else
86 
[2337]87@@ -698,6 +712,13 @@
[2066]88 #%setup -q -n %{srcdir}
89 %setup -q -b 1 -n %{srcdir}
[925]90 
[2066]91+# Apply the Scripts patch
[760]92+%patch1000 -p1 -b .scripts
[2337]93+%patch1001 -p1 -b .systemd-remote-fs
94+%patch1002 -p1 -b .systemd-crond
95+%patch1003 -p1 -b .systemd-csdb
96+%patch1004 -p1 -b .end-writeback
[2066]97+
[760]98 ##############################################################################
99 #
[2066]100 # building
[2337]101@@ -869,6 +890,8 @@
[2335]102 %endif
103 %endif
104 
105+./regen.sh
106+
107 ./configure --with-afs-sysname=${sysname} \
108        --prefix=%{_prefix} \
109        --libdir=%{_libdir} \
[2337]110@@ -1278,6 +1301,13 @@
[2066]111 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
112 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
113 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
114+%else
115+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
116+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
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}/libkopenafs.so
120+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
121 %endif
122 
123 %endif
Note: See TracBrowser for help on using the repository browser.