Commit 3b422187 authored by unknown's avatar unknown
Browse files

- 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)
parent a875ceaf

support-files/MacOSX/Info.plist.sh

+1 −5
Original line number Diff line number Diff line
@@ -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>

support-files/MacOSX/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -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