From 7cb0102b3470a54e0f7b0cfe5ecb98bcafd8ff1a Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 9 Nov 2007 19:31:22 +0000
Subject: [PATCH] DEVEL15-macos-packaging-updates-20071109

make the readme correct. make dmgs which have a useful name


(cherry picked from commit 10ff33e6092a63107600b3b58c44c8d15849bbe6)
---
 configure.in                                     |  1 +
 src/packaging/MacOS/{ReadMe.rtf => ReadMe.rtf.8} |  2 +-
 src/packaging/MacOS/ReadMe.rtf.9                 | 13 +++++++++++++
 .../MacOS/{buildpkg.sh => buildpkg.sh.in}        | 16 +++++++++++++---
 4 files changed, 28 insertions(+), 4 deletions(-)
 rename src/packaging/MacOS/{ReadMe.rtf => ReadMe.rtf.8} (98%)
 create mode 100644 src/packaging/MacOS/ReadMe.rtf.9
 rename src/packaging/MacOS/{buildpkg.sh => buildpkg.sh.in} (95%)

diff --git a/configure.in b/configure.in
index bd3f80200..990bf1aaf 100644
--- a/configure.in
+++ b/configure.in
@@ -85,6 +85,7 @@ src/null/Makefile \
 src/package/Makefile \
 src/packaging/MacOS/OpenAFS.Info.plist \
 src/packaging/MacOS/OpenAFS.info \
+src/packaging/MacOS/buildpkg.sh \
 src/packaging/RedHat/openafs.spec \
 src/pam/Makefile \
 src/pinstall/Makefile \
diff --git a/src/packaging/MacOS/ReadMe.rtf b/src/packaging/MacOS/ReadMe.rtf.8
similarity index 98%
rename from src/packaging/MacOS/ReadMe.rtf
rename to src/packaging/MacOS/ReadMe.rtf.8
index a2c5dddca..ada1c7dd5 100644
--- a/src/packaging/MacOS/ReadMe.rtf
+++ b/src/packaging/MacOS/ReadMe.rtf.8
@@ -4,7 +4,7 @@
 \margl1440\margr1440\vieww9000\viewh9000\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\fs20 \cf0 This release of OpenAFS is targeted at MacOS 10.4. 
+\f0\fs20 \cf0 This release of OpenAFS is targeted at MacOS 10.4. (Tiger)
 \
 Select a client cell name by editing /var/db/openafs/etc/ThisCell\
 \
diff --git a/src/packaging/MacOS/ReadMe.rtf.9 b/src/packaging/MacOS/ReadMe.rtf.9
new file mode 100644
index 000000000..dfba64d37
--- /dev/null
+++ b/src/packaging/MacOS/ReadMe.rtf.9
@@ -0,0 +1,13 @@
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf100
+{\fonttbl\f0\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh9000\viewkind0
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\fs20 \cf0 This release of OpenAFS is targeted at MacOS 10.5. (Leopard)
+\
+Select a client cell name by editing /var/db/openafs/etc/ThisCell\
+\
+The included afssettings program is distributed under the Apple Public Source License, version 2.0. See http://www.opensource.apple.com/apsl/2.0.txt or the included file 2.0.txt.\
+\
+Reboot when all of this is done.}
diff --git a/src/packaging/MacOS/buildpkg.sh b/src/packaging/MacOS/buildpkg.sh.in
similarity index 95%
rename from src/packaging/MacOS/buildpkg.sh
rename to src/packaging/MacOS/buildpkg.sh.in
index 4e924939f..9c1e272dc 100644
--- a/src/packaging/MacOS/buildpkg.sh
+++ b/src/packaging/MacOS/buildpkg.sh.in
@@ -25,6 +25,15 @@ CURDIR=`pwd`
 RESSRC=`dirname $0`
 RESSRC=`cd $RESSRC && pwd`
 majorvers=`uname -r | sed 's/\..*//'`
+if [ $majorvers -eq 7 ]; then
+  RELNAME="Panther"
+fi
+if [ $majorvers -eq 8 ]; then
+  RELNAME="Tiger"
+fi
+if [ $majorvers -eq 9 ]; then
+  RELNAME="Leopard"
+fi
 
 PKGROOT=$CURDIR/pkgroot
 PKGRES=$CURDIR/pkgres
@@ -67,7 +76,7 @@ if [ $firstpass = yes ]; then
           die=1
        fi
     fi
-    FILES="ReadMe.rtf License.rtf CellServDB.list OpenAFS.info OpenAFS.post_install OpenAFS.pre_upgrade csrvdbmerge.pl 2.0.txt"
+    FILES="ReadMe.rtf.$majorvers License.rtf CellServDB.list OpenAFS.info OpenAFS.post_install OpenAFS.pre_upgrade csrvdbmerge.pl 2.0.txt"
     for f in $FILES; do
        if [ ! -f $RESSRC/$f ]; then
 	 echo "file missing: " $RESSRC/$f
@@ -194,7 +203,8 @@ if [ $secondpass = yes ]; then
 	cp OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade
 	chmod a+x $PKGRES/OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade $PKGRES/OpenAFS.pre_upgrade
     fi
-    cp License.rtf ReadMe.rtf $PKGRES
+    cp License.rtf $PKGRES
+    cp ReadMe.rtf.$majorvers $PKGRES/ReadMe.rtf
     cp csrvdbmerge.pl $PKGRES
     chmod a+x $PKGRES/csrvdbmerge.pl
     cp CellServDB.list $PKGRES
@@ -236,7 +246,7 @@ if [ $secondpass = yes ]; then
     cp afslogo.jpg $CURDIR/dmg/.background
 #    hdiutil create -srcfolder $CURDIR/dmg -volname OpenAFS -anyowners $CURDIR/OpenAFS.dmg
     hdiutil makehybrid -hfs -hfs-volume-name OpenAFS -hfs-openfolder $CURDIR/dmg $CURDIR/dmg -o $CURDIR/TMP.dmg
-    hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS.dmg
+    hdiutil convert -format UDZO $CURDIR/TMP.dmg -o $CURDIR/OpenAFS-@VERSION@-$RELNAME.dmg
     rm $CURDIR/TMP.dmg
     rm -rf $CURDIR/dmg
     # Unfortunately, sudo sets $USER to root, so I can't chown the 
-- 
2.39.5