From: Christer Grafström <christer.grafstrom@ltu.se>
Date: Wed, 29 Oct 2014 07:05:06 +0000 (+0100)
Subject: Packaging support for MacOS X 10.10 "Yosemite"
X-Git-Tag: upstream/1.8.0_pre1^2~526
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8f630226f6f1f73a4d816b72caab3bb1e4620312;p=packages%2Fo%2Fopenafs.git

Packaging support for MacOS X 10.10 "Yosemite"

This is just the packaging part of the patch submitted in the
RT ticket. The configuration part is in the preceding change.

FIXES 131946

Change-Id: Ic5b200b1f54d7f9f9552b0f9e2b881c3f0af9bc2
Reviewed-on: http://gerrit.openafs.org/11561
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: D Brashear <shadow@your-file-system.com>
---

diff --git a/src/packaging/MacOS/InstallationCheck.14 b/src/packaging/MacOS/InstallationCheck.14
new file mode 100644
index 000000000..7ec78b4ab
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.14
@@ -0,0 +1,19 @@
+#!/bin/sh
+majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -ne 14 ]; then
+	exit 112
+fi
+
+# check for temporary versions of ThisCell and CellAlias
+# and move them aside
+tmpthiscell=/private/tmp/org.OpenAFS.Install.ThisCell.$USER
+tmpcellalias=/private/tmp/org.OpenAFS.Install.CellAlias.$USER
+date=`date +%Y%m%d%H%M`
+if [ -e $tmpthiscell ]; then
+    mv -f $tmpthiscell $tmpthiscell.$date
+fi
+if [ -e $tmpcellalias ]; then
+    mv -f $tmpcellalias $tmpcellalias.$date
+fi
+
+exit 0
diff --git a/src/packaging/MacOS/InstallationCheck.strings.14 b/src/packaging/MacOS/InstallationCheck.strings.14
new file mode 100644
index 000000000..87507e8bc
--- /dev/null
+++ b/src/packaging/MacOS/InstallationCheck.strings.14
@@ -0,0 +1 @@
+"16" = "This OpenAFS release requires Yosemite (10.10)";
diff --git a/src/packaging/MacOS/ReadMe.rtf.14 b/src/packaging/MacOS/ReadMe.rtf.14
new file mode 100644
index 000000000..b5f70c24b
--- /dev/null
+++ b/src/packaging/MacOS/ReadMe.rtf.14
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh9000\viewkind0
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\fs24 \cf0 This release of OpenAFS is targeted at MacOS 10.10 (Yosemite) and is not recommended for use with any other version.}
diff --git a/src/packaging/MacOS/buildpkg.sh.in b/src/packaging/MacOS/buildpkg.sh.in
index 28a4f096b..93b7049a7 100644
--- a/src/packaging/MacOS/buildpkg.sh.in
+++ b/src/packaging/MacOS/buildpkg.sh.in
@@ -46,6 +46,10 @@ fi
 if [ $majorvers -eq 13 ]; then
   RELNAME="Mavericks"
 fi
+if [ $majorvers -eq 14 ]; then
+  RELNAME="Yosemite"
+fi
+
 
 PKGROOT=$CURDIR/pkgroot
 PKGRES=$CURDIR/pkgres