Changeset 2712 for trunk/server/fedora

Timestamp:

Jul 13, 2015, 10:13:40 PM (9 years ago)

Author:

andersk

Message:

Update OpenAFS to 1.6.12

Location:

trunk/server/fedora

Files:

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

trunk/server/fedora/Makefile

@@ -41 +41 @@
 
 dload           = ${PWD}/.dload
-openafs_url     = "http://www.openafs.org/dl/openafs/candidate/1.6.11pre2/openafs-1.6.11-0.pre2.src.rpm"
+openafs_url     = "http://www.openafs.org/dl/openafs/1.6.12/openafs-1.6.12-1.src.rpm"
 #zephyr_url     = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
 

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

@@ -1 @@
---- openafs.spec.orig   2014-05-25 21:15:54.539027644 -0400
-+++ openafs.spec        2014-05-25 21:16:27.836268275 -0400
+--- openafs.spec.orig   2015-06-25 05:18:38.000000000 -0400
++++ openafs.spec        2015-07-13 21:41:31.196173273 -0400
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.11
+ %define pkgvers 1.6.12
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
--%define pkgrel 0.pre2
-+%define pkgrel 0.pre2.99.scripts.%{scriptsversion}
+-%define pkgrel 1
++%define pkgrel 1.99.scripts.%{scriptsversion}
  
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,14 @@
+@@ -255,9 +255,14 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -25 +25 @@
  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 +338,7 @@
+@@ -337,6 +342,7 @@
  %if %{build_userspace}
  
@@ -33 +33 @@
  %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
  Requires: systemd-units
-@@ -382,6 +390,7 @@
+@@ -388,6 +394,7 @@
  %package -n dkms-%{name}
  Summary:        DKMS-ready kernel source for AFS distributed filesystem
@@ -41 +41 @@
  %if %{fedorakmod}
  Provides: %{name}-kmod = %{version}
-@@ -403,6 +412,7 @@
+@@ -409,6 +416,7 @@
  
  %if %{build_authlibs}
@@ -49 +49 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +429,7 @@
+@@ -425,6 +433,7 @@
  %endif
  
@@ -57 +57 @@
  Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -437,6 +448,7 @@
+@@ -443,6 +452,7 @@
  libraries.
  
@@ -65 +65 @@
  Group: Development/Filesystems
  Requires: openafs = %{version}-%{release}
-@@ -466,6 +478,7 @@
+@@ -472,6 +482,7 @@
  administrators.
  
@@ -73 +73 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -515,6 +528,7 @@
+@@ -521,6 +532,7 @@
  
  %if %{krb5support}
@@ -81 +81 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -541,7 +555,7 @@
+@@ -547,7 +559,7 @@
  %if %{build_modules}
  
@@ -90 +90 @@
  %else
  
-@@ -698,6 +712,10 @@
+@@ -704,6 +716,10 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -101 +101 @@
  #
  # building
-@@ -871,6 +891,8 @@
+@@ -877,6 +893,8 @@
  %endif
  %endif
@@ -110 +110 @@
         --prefix=%{_prefix} \
         --libdir=%{_libdir} \
-@@ -1267,6 +1289,13 @@
+@@ -1273,6 +1291,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*