From 3b422187f6829da234914c713e4e8039c97e7291 Mon Sep 17 00:00:00 2001
From: unknown <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:
  - Set CFBundleShortVersionString to MYSQL_NO_DASH_VERSION, not VERSION
    (BUG#12584)
  - removed two obsolete keys: IFMajorVersion and IFMinorVersion - they
    are not actually used according to the "Software Distribution"
    documentation at http://developer.apple.com/
support-files/MacOSX/Makefile.am:
  - added an sed call to replace @MYSQL_NO_DASH_VERSION@ (e.g. for
    Info.plist (BUG#12584)
---
 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 f14902ff37..fdfb0c7a17 100644
--- a/support-files/MacOSX/Info.plist.sh
+++ b/support-files/MacOSX/Info.plist.sh
@@ -9,11 +9,7 @@
 	<key>CFBundleName</key>
 	<string>MySQL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>@VERSION@</string>
-	<key>IFMajorVersion</key>
-	<integer>4</integer>
-	<key>IFMinorVersion</key>
-	<integer>0</integer>
+	<string>@MYSQL_NO_DASH_VERSION@</string>
 	<key>IFPkgFlagAllowBackRev</key>
 	<false/>
 	<key>IFPkgFlagAuthorizationAction</key>
diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
index d751ed7ca5..ea99c46389 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
-- 
2.30.9