diff --git a/mac/Info.plist b/mac/Info.plist
index 8c4a06347..ef1f353b4 100755
--- a/mac/Info.plist
+++ b/mac/Info.plist
@@ -7,7 +7,7 @@
CFBundleExecutable
Gramps
CFBundleGetInfoString
- Trunk, (C) 1997-2011 The Gramps Team http://www.gramps-project.org
+ Trunk, (C) 1997-2012 The Gramps Team http://www.gramps-project.org
CFBundleIconFile
gramps.icns
CFBundleIdentifier
@@ -23,7 +23,7 @@
CFBundleVersion
Trunk
NSHumanReadableCopyright
- Copyright 1997 - 2011 The Gramps Team, GNU General Public License.
+ Copyright 1997 - 2012 The Gramps Team, GNU General Public License.
LSMinimumSystemVersion
10.5
diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index 08cb3fb49..9db6ab404 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -5,7 +5,7 @@
${env:JHBUILD_PREFIX}
${env:HOME}/Desktop
- ${project}/launcher.sh
+ ${project}/gramps.launcher
${project}/Info.plist
@@ -47,19 +47,23 @@
- ${prefix}/lib/python2.6/*.so
+ ${prefix}/lib/python2.7/*.so
${prefix}/lib/librsvg-2.2.dylib
+
+
${prefix}/lib/libgoocanvas.3.dylib
- ${prefix}/lib/libigemacintegration.0.dylib
+ ${prefix}/lib/libgtkmacintegration.0.dylib
@@ -83,11 +87,11 @@
- ${prefix}/lib/libproxy.0.dylib
+ ${prefix}/lib/libosmgpsmap.2.dylib
- ${prefix}/lib/libhunspell-1.2.0.dylib
+ ${prefix}/lib/libhunspell-1.3.0.dylib
@@ -118,13 +122,25 @@
- ${prefix}/lib/python2.6/*.py
+ ${prefix}/lib/python2.7/*.py
+
+
+
+ ${prefix}/lib/python2.7/config/
+
+
+
+ ${prefix}/include/python2.7/pyconfig.h
${prefix}/share/gramps/
+
+
${prefix}/share/enchant/
diff --git a/mac/launcher.sh b/mac/gramps.launcher
similarity index 86%
rename from mac/launcher.sh
rename to mac/gramps.launcher
index 83f2b406b..f183725d6 100755
--- a/mac/launcher.sh
+++ b/mac/gramps.launcher
@@ -28,9 +28,10 @@ export GVBINDIR="$bundle_lib/graphviz"
#Set $PYTHON to point inside the bundle
-PYVER=2.6
+PYVER=2.7
export PYTHON="$bundle_contents/MacOS/python"
export PYTHONHOME="$bundle_res"
+PYTHONPATH="$bundle_lib/python$PYVER/site-packages/pyenchant-1.6.1-py$PYVER.egg:$PYTHONPATH"
export PYTHONPATH="$bundle_lib/python$PYVER/site-packages/gtk-2.0:$PYTHONPATH"
export GRAMPSDIR="$bundle_data"/gramps
@@ -38,8 +39,8 @@ export GRAMPSI18N="$bundle_data"/locale
export GRAMPSHOME="$HOME/Library/Application Support"
# Strip out the argument added by the OS.
-if [ x`echo "x$1" | /usr/bin/sed -e "s/^x-psn_.*//"` == x ]; then
+if /bin/expr "x$1" : '^x-psn_' > /dev/null; then
shift 1
fi
-exec $PYTHON -O "$GRAMPSDIR/gramps.py" "$@"
+exec "$PYTHON" -O "$GRAMPSDIR/gramps.py" "$@"