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

Last change on this file since 2288 was 2288, checked in by ezyang, 12 years ago
OpenAFS for Linux 3.5
File size: 3.3 KB
RevLine 
[2288]1--- openafs.spec.~1~    2012-03-29 12:45:12.000000000 -0400
2+++ openafs.spec        2012-08-05 07:35:31.292297168 -0400
[2066]3@@ -4,7 +4,7 @@
[2288]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}
[2288]12@@ -252,6 +252,14 @@
[2066]13 
[760]14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
15 
[1]16+Patch1000: openafs-scripts.patch
[2200]17+Patch1001: openafs-systemd-remote-fs.patch
[2170]18+Patch1002: openafs-systemd-crond.patch
19+Patch1003: openafs-systemd-csdb.patch
[2288]20+Patch1004: openafs-linux-3.4-end-writeback.patch
21+Patch1005: openafs-linux-3.5-encode-fh.patch
22+%define _default_patch_fuzz 2
[1]23+
24 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
25 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
26 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
[2288]27@@ -331,6 +338,7 @@
[925]28 %if %{build_userspace}
[1]29 
[925]30 %package client
31+Provides: scripts-openafs-client
[1693]32 Requires: binutils, openafs = %{version}
[2288]33 %if 0%{?fedora} >= 15
34 Requires: systemd-units
35@@ -403,6 +411,7 @@
[925]36 
37 %if %{build_authlibs}
38 %package authlibs
39+Provides: scripts-openafs-authlibs
40 Summary: OpenAFS authentication shared libraries
41 Group: Networking/Filesystems
42 
[2288]43@@ -419,6 +428,7 @@
[925]44 %endif
45 
46 %package authlibs-devel
47+Provides: scripts-openafs-authlibs-devel
48 %if %{build_authlibs}
[2066]49 Requires: openafs-authlibs = %{version}-%{release}
[925]50 %endif
[2288]51@@ -437,6 +447,7 @@
[925]52 libraries.
53 
54 %package devel
55+Provides: scripts-openafs-devel
56 Summary: OpenAFS Development Libraries and Headers
57 Group: Development/Filesystems
[2066]58 Requires: openafs = %{version}-%{release}
[2288]59@@ -466,6 +477,7 @@
[925]60 administrators.
61 
62 %package kernel-source
63+Provides: scripts-openafs-kernel-source
64 Summary: OpenAFS Kernel Module source tree
65 Group: Networking/Filesystems
[1693]66 Provides: openafs-kernel = %{version}
[2288]67@@ -515,6 +527,7 @@
[925]68 
69 %if %{krb5support}
70 %package krb5
71+Provides: scripts-openafs-krb5
72 Summary: OpenAFS programs to use with krb5
[1693]73 Requires: openafs = %{version}
[925]74 Group: Networking/Filesystems
[2288]75@@ -541,7 +554,7 @@
[929]76 %if %{build_modules}
77 
78 %if %{fedorakmod}
79-%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
80+%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
81 
82 %else
83 
[2288]84@@ -698,6 +711,14 @@
[2066]85 #%setup -q -n %{srcdir}
86 %setup -q -b 1 -n %{srcdir}
[925]87 
[2066]88+# Apply the Scripts patch
[760]89+%patch1000 -p1 -b .scripts
[2200]90+%patch1001 -p1 -b .systemd-remote-fs
[2170]91+%patch1002 -p1 -b .systemd-crond
92+%patch1003 -p1 -b .systemd-csdb
[2288]93+%patch1004 -p1 -b .end-writeback
94+%patch1005 -p1 -b .encode-fh
[2066]95+
[760]96 ##############################################################################
97 #
[2066]98 # building
[2288]99@@ -1278,6 +1299,13 @@
[2066]100 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
101 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
102 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
103+%else
104+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
105+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
106+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
107+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
108+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
109+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
110 %endif
111 
112 %endif
Note: See TracBrowser for help on using the repository browser.