Changeset 2060 for branches/fc15-dev


Ignore:
Timestamp:
Nov 20, 2011, 11:35:12 PM (11 years ago)
Author:
ezyang
Message:
Backport OpenAFS patches to make it work with Linux 3.1
Location:
branches/fc15-dev/server
Files:
2 added
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc15-dev/server/fedora/specs/openafs.spec.patch

    r2011 r2060  
    1 --- openafs.spec.orig   2011-06-20 15:32:57.000000000 -0400
    2 +++ openafs.spec        2011-06-21 17:15:24.000000000 -0400
     1--- rpmbuild/SPECS/openafs.spec
     2+++ rpmbuild/SPECS/openafs.spec.~3~     2011-11-20 20:13:52.211673609 -0500
    33@@ -4,7 +4,7 @@
    44 %define pkgvers 1.6.0
     
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -247,6 +247,11 @@
    13  %endif
     12@@ -237,6 +237,13 @@
     13 
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    1515 
     
    1818+Patch1002: openafs-systemd.patch
    1919+Patch1003: openafs-systemd-crond.patch
     20+Patch1004: openafs-linux-3.1-rcu.patch
     21+Patch1005: openafs-linux-3.1-fsync.patch
    2022+
    2123 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    2224 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2325 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    24 @@ -326,6 +329,7 @@
     26@@ -316,6 +323,7 @@
    2527 %if %{build_userspace}
    2628 
     
    3032 
    3133 %if %{fedorakmod}
    32 @@ -386,6 +390,7 @@
     34@@ -376,6 +384,7 @@
    3335 
    3436 %if %{build_authlibs}
     
    3840 Group: Networking/Filesystems
    3941 
    40 @@ -402,6 +407,7 @@
     42@@ -392,6 +401,7 @@
    4143 %endif
    4244 
     
    4446+Provides: scripts-openafs-authlibs-devel
    4547 %if %{build_authlibs}
    46  Requires: openafs-authlibs = %{version}
     48 Requires: openafs-authlibs = %{version}-%{release}
    4749 %endif
    48 @@ -420,6 +426,7 @@
     50@@ -410,6 +420,7 @@
    4951 libraries.
    5052 
     
    5355 Summary: OpenAFS Development Libraries and Headers
    5456 Group: Development/Filesystems
    55  
    56 @@ -448,6 +455,7 @@
     57 Requires: openafs = %{version}-%{release}
     58@@ -439,6 +450,7 @@
    5759 administrators.
    5860 
     
    6264 Group: Networking/Filesystems
    6365 Provides: openafs-kernel = %{version}
    64 @@ -497,6 +505,7 @@
     66@@ -488,6 +500,7 @@
    6567 
    6668 %if %{krb5support}
     
    7072 Requires: openafs = %{version}
    7173 Group: Networking/Filesystems
    72 @@ -523,7 +532,7 @@
     74@@ -514,7 +527,7 @@
    7375 %if %{build_modules}
    7476 
     
    7981 %else
    8082 
    81 @@ -680,6 +689,12 @@
     83@@ -671,6 +684,14 @@
    8284 #%setup -q -n %{srcdir}
    8385 %setup -q -b 1 -n %{srcdir}
     
    8890+%patch1002 -p1 -b .systemd
    8991+%patch1003 -p1 -b .systemd-crond
     92+%patch1004 -p1 -b .rcu
     93+%patch1005 -p1 -b .fsync
    9094+
    9195 ##############################################################################
    9296 #
    9397 # building
    94 @@ -1215,6 +1230,13 @@
     98@@ -1212,6 +1233,13 @@
    9599 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
    96100 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Note: See TracChangeset for help on using the changeset viewer.