From 4880d22b79fc3ab486a4ec0b4f267bfbe06b367c Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Mon, 15 Aug 2005 15:44:56 +0200
Subject: [PATCH] - Removed a non-fatal error when running the Mac OS X 10.4
PackageMaker: CFBundleShortVersionString in Info.plist may not include a
version suffix like "-beta" (BUG#12584) - Minor cleanup: removed two unused
keys from Info.plist: IFMajorVersion and IFMinorVersion
---
support-files/MacOSX/Info.plist.sh | 6 +-----
support-files/MacOSX/Makefile.am | 1 +
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/support-files/MacOSX/Info.plist.sh b/support-files/MacOSX/Info.plist.sh
index f14902ff379..fdfb0c7a17c 100644
--- a/support-files/MacOSX/Info.plist.sh
+++ b/support-files/MacOSX/Info.plist.sh
@@ -9,11 +9,7 @@
CFBundleName
MySQL
CFBundleShortVersionString
- @VERSION@
- IFMajorVersion
- 4
- IFMinorVersion
- 0
+ @MYSQL_NO_DASH_VERSION@
IFPkgFlagAllowBackRev
IFPkgFlagAuthorizationAction
diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
index d751ed7ca5b..ea99c46389d 100644
--- a/support-files/MacOSX/Makefile.am
+++ b/support-files/MacOSX/Makefile.am
@@ -47,6 +47,7 @@ SUFFIXES = .sh
@SED@ \
-e 's!@''prefix''@!$(prefix)!g' \
-e 's!@''VERSION''@!@VERSION@!' \
+ -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
$< > $@-t