Merge pull request #33696 from clburlison/2016.3-pkg-fix

Update mac native package for upcoming release

pkg/osx/.gitignore

@@ -0,0 +1,3 @@
+/build
+*.pkg
+distribution.xml

pkg/osx/README.md

@@ -18,7 +18,7 @@ interfering with the rest of their system's Python packages.
 
 To build a native package you will need the following installed:
 
-- xCode, or the xCode command line tools
+- Xcode, or the Xcode Command Line Tools
 - git
 
 The native package will install package files into /opt/salt.

pkg/osx/build_pkg.sh

@@ -119,19 +119,6 @@ sudo rm -rdf $PKGDIR/opt/salt/lib/python2.7/test
 echo -n -e "\033]0;Build_Pkg: Remove compiled python files\007"
 sudo find $PKGDIR/opt/salt -name '*.pyc' -type f -delete
 
-############################################################################
-# Copy Additional Resources from Salt Repo to the Package Directory
-############################################################################
-echo -n -e "\033]0;Build_Pkg: Copy Additional Resources\007"
-
-mkdir -p $PKGDIR/resources
-cp $PKGRESOURCES/saltstack.png $PKGDIR/resources
-cp $PKGRESOURCES/*.rtf $PKGDIR/resources
-
-mkdir -p $PKGDIR/scripts
-cp $PKGRESOURCES/scripts/postinstall $PKGDIR/scripts
-cp $PKGRESOURCES/scripts/preinstall $PKGDIR/scripts
-
 ############################################################################
 # Copy Config Files from Salt Repo to the Package Directory
 ############################################################################
@@ -161,13 +148,13 @@ sed -i '' $SEDSTR distribution.xml
 ############################################################################
 echo -n -e "\033]0;Build_Pkg: Build Package\007"
 
-pkgbuild --root $PKGDIR \
-         --scripts $PKGDIR/scripts \
+pkgbuild --root=$PKGDIR \
+         --scripts=pkg-scripts \
          --identifier=com.saltstack.salt \
          --version=$VERSION \
          --ownership=recommended salt-src-$VERSION-$CPUARCH.pkg
 
-productbuild --resources=$PKGDIR/resources \
+productbuild --resources=pkg-resources \
              --distribution=distribution.xml  \
              --package-path=salt-src-$VERSION-$CPUARCH.pkg \
              --version=$VERSION salt-$VERSION-$CPUARCH.pkg

pkg/osx/pkg-resources/welcome.rtf

@@ -25,4 +25,4 @@ Sample configuration files (
 This Salt package uses a custom-built Python. To install additional Python modules for Salt, use the associated 'pip' binary. For example, if you need LDAP support in Salt you will need the 'python-ldap' module. Install it with 
 \f1\fs22 /opt/salt/bin/pip install python-ldap
 \f0\fs24 \
-Note that some Python modules need a compiler available. Installing Apple's xCode command line tools should provide the necessary utilities. Alternatively, {\field{\*\fldinst{HYPERLINK "http://macports.org/"}}{\fldrslt \cf2 \ul \ulc2 MacPorts}}, {\field{\*\fldinst{HYPERLINK "http://finkproject.org/"}}{\fldrslt \cf2 \ul \ulc2 Fink}}, or {\field{\*\fldinst{HYPERLINK "http://brew.sh/"}}{\fldrslt \cf2 \ul \ulc2 Homebrew}} may provide what you need.}
+Note that some Python modules need a compiler available. Installing Apple's Xcode Command Line Tools should provide the necessary utilities. Alternatively, {\field{\*\fldinst{HYPERLINK "http://macports.org/"}}{\fldrslt \cf2 \ul \ulc2 MacPorts}}, {\field{\*\fldinst{HYPERLINK "http://finkproject.org/"}}{\fldrslt \cf2 \ul \ulc2 Fink}}, or {\field{\*\fldinst{HYPERLINK "http://brew.sh/"}}{\fldrslt \cf2 \ul \ulc2 Homebrew}} may provide what you need.}