From 6936a6a4e7c4fedae37c464c9bf63b90e429f30a Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 10 Jan 2016 16:47:30 -0800
Subject: [PATCH] osx package fixes: correct version, allow installation to any
drive.
---
make_osx_package.sh | 2 +-
osx/distribution.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/make_osx_package.sh b/make_osx_package.sh
index 320c3fead..16cddcb0c 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -60,7 +60,7 @@ echo Creating OSX package...
rm -rf $BASE.pkg
pkgbuild --root $DIST/pandoc --identifier net.johnmacfarlane.pandoc --version 1.13 --ownership recommended $DIST/pandoc.pkg
-productbuild --distribution osx/distribution.xml --resources $DIST/Resources --package-path $DIST --version 1.13 --sign "Developer ID Installer: John Macfarlane" $BASE-osx.pkg
+productbuild --distribution osx/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "Developer ID Installer: John Macfarlane" $BASE-osx.pkg
# verify signature
spctl --assess --type install $BASE-osx.pkg
diff --git a/osx/distribution.xml b/osx/distribution.xml
index 024a25bd1..c3218aad3 100644
--- a/osx/distribution.xml
+++ b/osx/distribution.xml
@@ -2,8 +2,8 @@
<installer-gui-script minSpecVersion="1">
<title>pandoc</title>
<organization>net.johnmacfarlane.pandoc</organization>
- <domains enable_localSystem="true"/>
- <options customize="never" require-scripts="true" rootVolumeOnly="true" />
+ <domains enable_localSystem="true" enable_anywhere="true" />
+ <options customize="allow" require-scripts="false" rootVolumeOnly="false" />
<!-- Define documents displayed at various steps -->
<!-- <welcome file="welcome.html" mime-type="text/html" /> -->
<license file="license.html" mime-type="text/html" />
@@ -11,7 +11,7 @@
<options hostArchitectures="x86_64" />
<!-- List all component packages -->
<pkg-ref id="net.johnmacfarlane.pandoc"
- version="1.13"
+ version="1.16.0.1"
auth="root">pandoc.pkg</pkg-ref>
<!-- List them again here. They can now be organized
as a hierarchy if you want. -->