Changeset 2371 for trunk/server/fedora

Timestamp:

Feb 10, 2013, 4:52:34 AM (12 years ago)

Author:

andersk

Message:

Update to OpenAFS 1.6.2pre3 for kernel 3.7 support

Location:

trunk/server/fedora

Files:

• Makefile (modified) (1 diff)
• specs/openafs.spec.patch (modified) (12 diffs)

trunk/server/fedora/Makefile

@@ -40 +40 @@
 server_url      = "http://web.mit.edu/scripts/src"
 server_arch     = "fedora.stable"
-openafs_url     = "http://dl.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-1.src.rpm"
+openafs_url     = "http://www.openafs.org/dl/openafs/candidate/1.6.2pre3/openafs-1.6.2-0.pre3.src.rpm"
 zephyr_url      = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
 

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

@@ -2 +2 @@
 +++ openafs.spec        2012-11-10 12:45:48.679334955 -0500
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.1
+ %define pkgvers 1.6.2
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
--%define pkgrel 1
-+%define pkgrel 1.99.scripts.%{scriptsversion}
+-%define pkgrel 0.pre3
++%define pkgrel 0.pre3.99.scripts.%{scriptsversion}
  
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,17 @@
+@@ -249,9 +249,15 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -19 +19 @@
  
 +Patch1000: openafs-scripts.patch
-+Patch1001: openafs-systemd-remote-fs.patch
 +Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-linux-support.patch
 +%define _default_patch_fuzz 2
 +
@@ -28 +26 @@
  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
-@@ -331,6 +339,7 @@
+@@ -331,6 +337,7 @@
  %if %{build_userspace}
  
@@ -36 +34 @@
  %if 0%{?fedora} >= 15
  Requires: systemd-units
-@@ -403,6 +412,7 @@
+@@ -403,6 +410,7 @@
  
  %if %{build_authlibs}
@@ -44 +42 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +429,7 @@
+@@ -419,6 +427,7 @@
  %endif
  
@@ -52 +50 @@
  Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -437,6 +448,7 @@
+@@ -437,6 +446,7 @@
  libraries.
  
@@ -60 +58 @@
  Group: Development/Filesystems
  Requires: openafs = %{version}-%{release}
-@@ -466,6 +478,7 @@
+@@ -466,6 +476,7 @@
  administrators.
  
@@ -68 +66 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -515,6 +528,7 @@
+@@ -515,6 +526,7 @@
  
  %if %{krb5support}
@@ -76 +74 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -541,7 +555,7 @@
+@@ -541,7 +553,7 @@
  %if %{build_modules}
  
@@ -85 +83 @@
  %else
  
-@@ -698,6 +712,13 @@
+@@ -698,6 +710,11 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -91 +89 @@
 +# Apply the Scripts patch
 +%patch1000 -p1 -b .scripts
-+%patch1001 -p1 -b .systemd-remote-fs
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .end-writeback
 +
  ##############################################################################
  #
  # building
-@@ -869,6 +890,8 @@
+@@ -869,6 +886,8 @@
  %endif
  %endif
@@ -108 +104 @@
         --prefix=%{_prefix} \
         --libdir=%{_libdir} \
-@@ -1278,6 +1301,13 @@
+@@ -1278,6 +1297,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*