Changeset 2371 for trunk/server/fedora


Ignore:
Timestamp:
Feb 10, 2013, 4:52:34 AM (10 years ago)
Author:
andersk
Message:
Update to OpenAFS 1.6.2pre3 for kernel 3.7 support
Location:
trunk/server/fedora
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/Makefile

    r2363 r2371  
    4040server_url      = "http://web.mit.edu/scripts/src"
    4141server_arch     = "fedora.stable"
    42 openafs_url     = "http://dl.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-1.src.rpm"
     42openafs_url     = "http://www.openafs.org/dl/openafs/candidate/1.6.2pre3/openafs-1.6.2-0.pre3.src.rpm"
    4343zephyr_url      = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
    4444
  • trunk/server/fedora/specs/openafs.spec.patch

    r2337 r2371  
    22+++ openafs.spec        2012-11-10 12:45:48.679334955 -0500
    33@@ -4,7 +4,7 @@
    4  %define pkgvers 1.6.1
     4 %define pkgvers 1.6.2
    55 # for beta/rc releases make pkgrel 0.<tag>
    66 # for real releases make pkgrel 1 (or more for extra releases)
    7 -%define pkgrel 1
    8 +%define pkgrel 1.99.scripts.%{scriptsversion}
     7-%define pkgrel 0.pre3
     8+%define pkgrel 0.pre3.99.scripts.%{scriptsversion}
    99 
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -249,9 +249,17 @@
     12@@ -249,9 +249,15 @@
    1313 %if %{build_modules}
    1414 BuildRequires: kernel-devel
     
    1919 
    2020+Patch1000: openafs-scripts.patch
    21 +Patch1001: openafs-systemd-remote-fs.patch
    2221+Patch1002: openafs-systemd-crond.patch
    2322+Patch1003: openafs-systemd-csdb.patch
    24 +Patch1004: openafs-linux-support.patch
    2523+%define _default_patch_fuzz 2
    2624+
     
    2826 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2927 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    30 @@ -331,6 +339,7 @@
     28@@ -331,6 +337,7 @@
    3129 %if %{build_userspace}
    3230 
     
    3634 %if 0%{?fedora} >= 15
    3735 Requires: systemd-units
    38 @@ -403,6 +412,7 @@
     36@@ -403,6 +410,7 @@
    3937 
    4038 %if %{build_authlibs}
     
    4442 Group: Networking/Filesystems
    4543 
    46 @@ -419,6 +429,7 @@
     44@@ -419,6 +427,7 @@
    4745 %endif
    4846 
     
    5250 Requires: openafs-authlibs = %{version}-%{release}
    5351 %endif
    54 @@ -437,6 +448,7 @@
     52@@ -437,6 +446,7 @@
    5553 libraries.
    5654 
     
    6058 Group: Development/Filesystems
    6159 Requires: openafs = %{version}-%{release}
    62 @@ -466,6 +478,7 @@
     60@@ -466,6 +476,7 @@
    6361 administrators.
    6462 
     
    6866 Group: Networking/Filesystems
    6967 Provides: openafs-kernel = %{version}
    70 @@ -515,6 +528,7 @@
     68@@ -515,6 +526,7 @@
    7169 
    7270 %if %{krb5support}
     
    7674 Requires: openafs = %{version}
    7775 Group: Networking/Filesystems
    78 @@ -541,7 +555,7 @@
     76@@ -541,7 +553,7 @@
    7977 %if %{build_modules}
    8078 
     
    8583 %else
    8684 
    87 @@ -698,6 +712,13 @@
     85@@ -698,6 +710,11 @@
    8886 #%setup -q -n %{srcdir}
    8987 %setup -q -b 1 -n %{srcdir}
     
    9189+# Apply the Scripts patch
    9290+%patch1000 -p1 -b .scripts
    93 +%patch1001 -p1 -b .systemd-remote-fs
    9491+%patch1002 -p1 -b .systemd-crond
    9592+%patch1003 -p1 -b .systemd-csdb
    96 +%patch1004 -p1 -b .end-writeback
    9793+
    9894 ##############################################################################
    9995 #
    10096 # building
    101 @@ -869,6 +890,8 @@
     97@@ -869,6 +886,8 @@
    10298 %endif
    10399 %endif
     
    108104        --prefix=%{_prefix} \
    109105        --libdir=%{_libdir} \
    110 @@ -1278,6 +1301,13 @@
     106@@ -1278,6 +1297,13 @@
    111107 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
    112108 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Note: See TracChangeset for help on using the changeset viewer.