Changeset 2337 for trunk/server


Ignore:
Timestamp:
Dec 5, 2012, 2:21:01 AM (10 years ago)
Author:
andersk
Message:
Revert to OpenAFS 1.6.1 plus minimal patches for Linux 3.6
Location:
trunk/server
Files:
1 added
1 deleted
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/specs/openafs.spec.patch

    r2335 r2337  
    11--- openafs.spec.orig   2012-11-10 05:22:28.754019405 -0500
    22+++ 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
    95 # for beta/rc releases make pkgrel 0.<tag>
    106 # for real releases make pkgrel 1 (or more for extra releases)
     
    1410 %{!?fedorakmod: %define fedorakmod 1}
    1511 %{!?build_dkmspkg: %define build_dkmspkg 1}
    16 @@ -249,9 +249,16 @@
     12@@ -249,9 +249,17 @@
    1713 %if %{build_modules}
    1814 BuildRequires: kernel-devel
     
    2218 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    2319 
    24 +Patch999:  openafs-stable-1.6.1.1.patch
    2520+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
    2825+%define _default_patch_fuzz 2
    2926+
     
    3128 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    3229 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    33 @@ -331,6 +338,7 @@
     30@@ -331,6 +339,7 @@
    3431 %if %{build_userspace}
    3532 
     
    3936 %if 0%{?fedora} >= 15
    4037 Requires: systemd-units
    41 @@ -403,6 +411,7 @@
     38@@ -403,6 +412,7 @@
    4239 
    4340 %if %{build_authlibs}
     
    4744 Group: Networking/Filesystems
    4845 
    49 @@ -419,6 +428,7 @@
     46@@ -419,6 +429,7 @@
    5047 %endif
    5148 
     
    5552 Requires: openafs-authlibs = %{version}-%{release}
    5653 %endif
    57 @@ -437,6 +447,7 @@
     54@@ -437,6 +448,7 @@
    5855 libraries.
    5956 
     
    6360 Group: Development/Filesystems
    6461 Requires: openafs = %{version}-%{release}
    65 @@ -466,6 +477,7 @@
     62@@ -466,6 +478,7 @@
    6663 administrators.
    6764 
     
    7168 Group: Networking/Filesystems
    7269 Provides: openafs-kernel = %{version}
    73 @@ -515,6 +527,7 @@
     70@@ -515,6 +528,7 @@
    7471 
    7572 %if %{krb5support}
     
    7976 Requires: openafs = %{version}
    8077 Group: Networking/Filesystems
    81 @@ -541,7 +554,7 @@
     78@@ -541,7 +555,7 @@
    8279 %if %{build_modules}
    8380 
     
    8885 %else
    8986 
    90 @@ -698,6 +711,12 @@
     87@@ -698,6 +712,13 @@
    9188 #%setup -q -n %{srcdir}
    9289 %setup -q -b 1 -n %{srcdir}
    9390 
    9491+# Apply the Scripts patch
    95 +%patch999  -p1 -b .1.6.1.1
    9692+%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
    9997+
    10098 ##############################################################################
    10199 #
    102100 # building
    103 @@ -869,6 +888,8 @@
     101@@ -869,6 +890,8 @@
    104102 %endif
    105103 %endif
     
    110108        --prefix=%{_prefix} \
    111109        --libdir=%{_libdir} \
    112 @@ -1278,6 +1299,13 @@
     110@@ -1278,6 +1301,13 @@
    113111 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
    114112 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Note: See TracChangeset for help on using the changeset viewer.