Changeset 2337 for trunk/server/fedora
- Timestamp:
- Dec 5, 2012, 2:21:01 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/fedora/specs/openafs.spec.patch
r2335 r2337 1 1 --- openafs.spec.orig 2012-11-10 05:22:28.754019405 -0500 2 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 3 @@ -4,7 +4,7 @@ 4 %define pkgvers 1.6.1 9 5 # for beta/rc releases make pkgrel 0.<tag> 10 6 # for real releases make pkgrel 1 (or more for extra releases) … … 14 10 %{!?fedorakmod: %define fedorakmod 1} 15 11 %{!?build_dkmspkg: %define build_dkmspkg 1} 16 @@ -249,9 +249,1 6@@12 @@ -249,9 +249,17 @@ 17 13 %if %{build_modules} 18 14 BuildRequires: kernel-devel … … 22 18 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 23 19 24 +Patch999: openafs-stable-1.6.1.1.patch25 20 +Patch1000: openafs-scripts.patch 26 +Patch1001: openafs-systemd-crond.patch 27 +Patch1002: openafs-systemd-csdb.patch 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 28 25 +%define _default_patch_fuzz 2 29 26 + … … 31 28 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 32 29 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 33 @@ -331,6 +33 8,7 @@30 @@ -331,6 +339,7 @@ 34 31 %if %{build_userspace} 35 32 … … 39 36 %if 0%{?fedora} >= 15 40 37 Requires: systemd-units 41 @@ -403,6 +41 1,7 @@38 @@ -403,6 +412,7 @@ 42 39 43 40 %if %{build_authlibs} … … 47 44 Group: Networking/Filesystems 48 45 49 @@ -419,6 +42 8,7 @@46 @@ -419,6 +429,7 @@ 50 47 %endif 51 48 … … 55 52 Requires: openafs-authlibs = %{version}-%{release} 56 53 %endif 57 @@ -437,6 +44 7,7 @@54 @@ -437,6 +448,7 @@ 58 55 libraries. 59 56 … … 63 60 Group: Development/Filesystems 64 61 Requires: openafs = %{version}-%{release} 65 @@ -466,6 +47 7,7 @@62 @@ -466,6 +478,7 @@ 66 63 administrators. 67 64 … … 71 68 Group: Networking/Filesystems 72 69 Provides: openafs-kernel = %{version} 73 @@ -515,6 +52 7,7 @@70 @@ -515,6 +528,7 @@ 74 71 75 72 %if %{krb5support} … … 79 76 Requires: openafs = %{version} 80 77 Group: Networking/Filesystems 81 @@ -541,7 +55 4,7 @@78 @@ -541,7 +555,7 @@ 82 79 %if %{build_modules} 83 80 … … 88 85 %else 89 86 90 @@ -698,6 +71 1,12@@87 @@ -698,6 +712,13 @@ 91 88 #%setup -q -n %{srcdir} 92 89 %setup -q -b 1 -n %{srcdir} 93 90 94 91 +# Apply the Scripts patch 95 +%patch999 -p1 -b .1.6.1.196 92 +%patch1000 -p1 -b .scripts 97 +%patch1001 -p1 -b .systemd-crond 98 +%patch1002 -p1 -b .systemd-csdb 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 99 97 + 100 98 ############################################################################## 101 99 # 102 100 # building 103 @@ -869,6 +8 88,8 @@101 @@ -869,6 +890,8 @@ 104 102 %endif 105 103 %endif … … 110 108 --prefix=%{_prefix} \ 111 109 --libdir=%{_libdir} \ 112 @@ -1278,6 +1 299,13 @@110 @@ -1278,6 +1301,13 @@ 113 111 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so 114 112 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Note: See TracChangeset
for help on using the changeset viewer.