From 776bf91371de97dc892e4b1ae329005ee9002e82 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 11 Aug 2005 20:13:12 +0200
Subject: [PATCH 1/3] - Make sure the Mac OS X support files are built, but not
 installed by "make install" (the previous   change was too drastic)
 (BUG#12506)

---
 support-files/MacOSX/Makefile.am | 6 ++++++
 support-files/Makefile.am        | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
index a4915deccf6..cc22d08daea 100644
--- a/support-files/MacOSX/Makefile.am
+++ b/support-files/MacOSX/Makefile.am
@@ -28,6 +28,12 @@ EXTRA_DIST =	Info.plist.sh \
 		StartupItem.Info.plist \
 		StartupItem.postinstall
 
+noinst_DATA = Info.plist \
+		Description.plist \
+		StartupParameters.plist \
+		postinstall \
+		preinstall
+
 CLEANFILES =	Info.plist \
 		Description.plist \
 		StartupParameters.plist \
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index 59ee837825b..eba3a534489 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -41,6 +41,9 @@ pkgdata_DATA =		my-small.cnf \
 
 pkgdata_SCRIPTS =	mysql.server
 
+noinst_DATA = mysql-@VERSION@.spec \
+			MySQL-shared-compat.spec
+
 CLEANFILES =		my-small.cnf \
 			my-medium.cnf \
 			my-large.cnf \

From c1c336f84b803bf42cba93d3260d2138225685e8 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 11 Aug 2005 20:23:12 +0200
Subject: [PATCH 2/3] - Fix for BUG#11380 (as recommened by JimW): renamed the
 preinstall/postinstall scripts to   preflight/postflight instead, so they are
 run every time a PKG is installed, not only for   a fresh installation

---
 support-files/MacOSX/Makefile.am                     | 12 ++++++------
 .../MacOSX/{postinstall.sh => postflight.sh}         |  2 +-
 support-files/MacOSX/{preinstall.sh => preflight.sh} |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename support-files/MacOSX/{postinstall.sh => postflight.sh} (85%)
 rename support-files/MacOSX/{preinstall.sh => preflight.sh} (77%)

diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
index cc22d08daea..d23ea142170 100644
--- a/support-files/MacOSX/Makefile.am
+++ b/support-files/MacOSX/Makefile.am
@@ -20,8 +20,8 @@
 EXTRA_DIST =	Info.plist.sh \
 		Description.plist.sh \
 		StartupParameters.plist.sh \
-		postinstall.sh \
-		preinstall.sh \
+		postflight.sh \
+		preflight.sh \
 		ReadMe.txt \
 		MySQL \
 		StartupItem.Description.plist \
@@ -31,14 +31,14 @@ EXTRA_DIST =	Info.plist.sh \
 noinst_DATA = Info.plist \
 		Description.plist \
 		StartupParameters.plist \
-		postinstall \
-		preinstall
+		postflight \
+		preflight
 
 CLEANFILES =	Info.plist \
 		Description.plist \
 		StartupParameters.plist \
-		postinstall \
-		preinstall
+		postflight \
+		preflight
 
 SUFFIXES = .sh
 
diff --git a/support-files/MacOSX/postinstall.sh b/support-files/MacOSX/postflight.sh
similarity index 85%
rename from support-files/MacOSX/postinstall.sh
rename to support-files/MacOSX/postflight.sh
index f46f4480e3e..df3cd419360 100644
--- a/support-files/MacOSX/postinstall.sh
+++ b/support-files/MacOSX/postflight.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# postinstall - this script will be executed after the MySQL PKG
+# postfligh - this script will be executed after the MySQL PKG
 # installation has been performed.
 #
 # This script will install the MySQL privilege tables using the
diff --git a/support-files/MacOSX/preinstall.sh b/support-files/MacOSX/preflight.sh
similarity index 77%
rename from support-files/MacOSX/preinstall.sh
rename to support-files/MacOSX/preflight.sh
index 62772573c46..700d0640a9e 100644
--- a/support-files/MacOSX/preinstall.sh
+++ b/support-files/MacOSX/preflight.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# preinstall - this script will be executed before the MySQL PKG
+# preflight - this script will be executed before the MySQL PKG
 # installation will be performed.
 #
 # If this package has been compiled with a prefix ending with "mysql" (e.g.
-# /usr/local/mysql or /opt/mysql), it will rename any previosuly existing
+# /usr/local/mysql or /opt/mysql), it will rename any previously existing
 # directory with this name before installing the new package (which includes
 # a symlink named "mysql", pointing to the newly installed directory, which
 # is named mysql-<version>)

From 16b696a60e42a581372efab73508efb67ebc6df2 Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Thu, 11 Aug 2005 21:18:45 +0200
Subject: [PATCH 3/3] - another comment typo fixed

---
 support-files/MacOSX/postflight.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-files/MacOSX/postflight.sh b/support-files/MacOSX/postflight.sh
index df3cd419360..c253ccbc6f2 100644
--- a/support-files/MacOSX/postflight.sh
+++ b/support-files/MacOSX/postflight.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# postfligh - this script will be executed after the MySQL PKG
+# postflight - this script will be executed after the MySQL PKG
 # installation has been performed.
 #
 # This script will install the MySQL privilege tables using the