Changeset 2288 for trunk/server/fedora/specs

Timestamp:

Aug 5, 2012, 10:26:57 AM (12 years ago)

Author:

ezyang

Message:

OpenAFS for Linux 3.5

File:

• trunk/server/fedora/specs/openafs.spec.patch (modified) (11 diffs)

trunk/server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- openafs.spec        2012-02-13 15:41:02.757592190 -0500
-+++ openafs.spec.~3~    2012-02-13 15:48:25.366294629 -0500
+--- openafs.spec.~1~    2012-03-29 12:45:12.000000000 -0400
++++ openafs.spec        2012-08-05 07:35:31.292297168 -0400
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.0
+ %define pkgvers 1.6.1
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
@@ -10 +10 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -237,6 +237,11 @@
+@@ -252,6 +252,14 @@
  
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -18 +18 @@
 +Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
++Patch1004: openafs-linux-3.4-end-writeback.patch
++Patch1005: openafs-linux-3.5-encode-fh.patch
++%define _default_patch_fuzz 2
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -316,6 +325,7 @@
+@@ -331,6 +338,7 @@
  %if %{build_userspace}
  
@@ -28 +31 @@
 +Provides: scripts-openafs-client
  Requires: binutils, openafs = %{version}
- 
- %if %{fedorakmod}
-@@ -376,6 +386,7 @@
+ %if 0%{?fedora} >= 15
+ Requires: systemd-units
+@@ -403,6 +411,7 @@
  
  %if %{build_authlibs}
@@ -38 +41 @@
  Group: Networking/Filesystems
  
-@@ -392,6 +403,7 @@
+@@ -419,6 +428,7 @@
  %endif
  
@@ -46 +49 @@
  Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -410,6 +422,7 @@
+@@ -437,6 +447,7 @@
  libraries.
  
@@ -54 +57 @@
  Group: Development/Filesystems
  Requires: openafs = %{version}-%{release}
-@@ -439,6 +452,7 @@
+@@ -466,6 +477,7 @@
  administrators.
  
@@ -62 +65 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -488,6 +502,7 @@
+@@ -515,6 +527,7 @@
  
  %if %{krb5support}
@@ -70 +73 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -514,7 +529,7 @@
+@@ -541,7 +554,7 @@
  %if %{build_modules}
  
@@ -79 +82 @@
  %else
  
-@@ -671,6 +686,12 @@
+@@ -698,6 +711,14 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -88 +91 @@
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
++%patch1004 -p1 -b .end-writeback
++%patch1005 -p1 -b .encode-fh
 +
  ##############################################################################
  #
  # building
-@@ -1212,6 +1237,13 @@
+@@ -1278,6 +1299,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*