Changeset 1913 for branches/fc15-dev/server/fedora/specs
- Timestamp:
- Jun 20, 2011, 7:07:43 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/fc15-dev/server/fedora/specs/openafs.spec.patch
r1836 r1913 1 --- openafs.spec.orig 2010-09-10 18:21:53.000000000 -0400 2 +++ openafs.spec 2010-09-10 18:34:30.000000000 -0400 3 @@ -8,7 +8,7 @@ 4 # for beta/rc releases make pkgrel 0.X.<tag> 1 --- openafs.spec.orig 2011-06-20 15:32:57.000000000 -0400 2 +++ openafs.spec 2011-06-20 17:45:49.000000000 -0400 3 @@ -4,7 +4,7 @@ 4 %define pkgvers 1.6.0 5 # for beta/rc releases make pkgrel 0.<tag> 5 6 # for real releases make pkgrel 1 (or more for extra releases) 6 #%define pkgrel 0.1.rc1 7 -%define pkgrel 1.1 8 +%define pkgrel 1.1.99scripts.%{scriptsversion} 7 -%define pkgrel 0.pre6 8 +%define pkgrel 0.pre6.99.scripts.%{scriptsversion} 9 9 10 % if %{?osvers:0}%{!?osvers:1}11 % define osvers 112 @@ -2 61,6 +261,19@@10 %{!?fedorakmod: %define fedorakmod 1} 11 %{!?build_dkmspkg: %define build_dkmspkg 1} 12 @@ -247,6 +247,8 @@ 13 13 %endif 14 14 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 15 15 16 16 +Patch1000: openafs-scripts.patch 17 +Patch1003: openafs-localcsdb.patch18 +Patch1005: openafs-numsysnames.patch19 +Patch1006: openafs-0001-Linux-Add-autoconf-macro-for-structure-checks.patch20 +Patch1007: openafs-0002-Linux-Add-general-autoconf-macro-for-Linux-kernel.patch21 +Patch1008: openafs-0003-Linux-allow-compile-flags-to-be-passed-to-AC_CHECK_L.patch22 +Patch1009: openafs-0004-Linux-2.6.38-Adjust-for-permission-inode-operation-c.patch23 +Patch1010: openafs-0005-linux-2.6.38-New-d_op-handling.patch24 +Patch1011: openafs-0006-linux-2.6.38-Make-d_revalidate-RCU-walk-aware.patch25 +Patch1012: openafs-0007-Linux-2.6.38-deal-with-dcache_lock-removal.patch26 +Patch1013: openafs-0008-Linux-2.6.38-dentry-d_count-is-not-an-atomic.patch27 +Patch1014: openafs-0009-fix-broken-earlier.patch28 17 + 29 18 # http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... 30 19 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 31 20 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 32 @@ -3 43,6 +347,7 @@21 @@ -326,6 +328,7 @@ 33 22 %if %{build_userspace} 34 23 … … 38 27 39 28 %if %{fedorakmod} 40 @@ - 403,6 +408,7 @@29 @@ -386,6 +389,7 @@ 41 30 42 31 %if %{build_authlibs} … … 46 35 Group: Networking/Filesystems 47 36 48 @@ -4 19,6 +425,7 @@37 @@ -402,6 +406,7 @@ 49 38 %endif 50 39 … … 54 43 Requires: openafs-authlibs = %{version} 55 44 %endif 56 @@ -4 37,6 +444,7 @@45 @@ -420,6 +425,7 @@ 57 46 libraries. 58 47 … … 62 51 Group: Development/Filesystems 63 52 64 @@ -4 65,6 +473,7 @@53 @@ -448,6 +454,7 @@ 65 54 administrators. 66 55 … … 70 59 Group: Networking/Filesystems 71 60 Provides: openafs-kernel = %{version} 72 @@ - 514,6 +523,7 @@61 @@ -497,6 +504,7 @@ 73 62 74 63 %if %{krb5support} … … 78 67 Requires: openafs = %{version} 79 68 Group: Networking/Filesystems 80 @@ -5 40,7 +550,7 @@69 @@ -523,7 +531,7 @@ 81 70 %if %{build_modules} 82 71 … … 87 76 %else 88 77 89 @@ -699,6 +709,18 @@ 78 @@ -680,6 +688,9 @@ 79 #%setup -q -n %{srcdir} 80 %setup -q -b 1 -n %{srcdir} 90 81 91 # Patch openafs to build a kernel module named "openafs" instead of "libafs" 92 %patch0 -p1 -b .kmod26 82 +# Apply the Scripts patch 93 83 +%patch1000 -p1 -b .scripts 94 +%patch1003 -p1 -b .localcsdb 95 +%patch1005 -p1 -b .numsysnames 96 +%patch1006 -p1 -b .0001 97 +%patch1007 -p1 -b .0002 98 +%patch1008 -p1 -b .0003 99 +%patch1009 -p1 -b .0004 100 +%patch1010 -p1 -b .0005 101 +%patch1011 -p1 -b .0006 102 +%patch1012 -p1 -b .0007 103 +%patch1013 -p1 -b .0008 104 +%patch1014 -p1 -b .0009 105 84 + 106 85 ############################################################################## 107 86 # 108 @@ -1140,7 +1140,6 @@ 109 %{_bindir}/bos 110 %{_bindir}/fs 111 %{_bindir}/kapasswd 112 -%{_bindir}/kpasswd 113 %{_bindir}/klog 114 %{_bindir}/klog.krb 115 %{_bindir}/pagsh 116 87 # building 88 @@ -1215,6 +1226,13 @@ 89 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so 90 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* 91 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* 92 +%else 93 +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so 94 +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so 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}/libkopenafs.so 98 +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* 99 %endif 100 101 %endif
Note: See TracChangeset
for help on using the changeset viewer.