diff options
| author | unknown <tsmith@quadxeon.mysql.com> | 2007-01-11 01:59:11 +0100 |
|---|---|---|
| committer | unknown <tsmith@quadxeon.mysql.com> | 2007-01-11 01:59:11 +0100 |
| commit | 7b524960a5adda29805da2cd301f9ba0af8ca43d (patch) | |
| tree | a477becbfc6f429fb93a74a52d0aa1ec09327bff | |
| parent | b012588f3aed7eb10dd418213bea3dc5f281df5b (diff) | |
| parent | e6e7d0cf459485f148c86de359439e92c647df4e (diff) | |
| download | mariadb-git-7b524960a5adda29805da2cd301f9ba0af8ca43d.tar.gz | |
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mysql-4.0-bug15815
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g40
| -rw-r--r-- | scripts/make_binary_distribution.sh | 1 | ||||
| -rw-r--r-- | support-files/MySQL-shared-compat.spec.sh | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 5748c024387..cb9e8ecbb91 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -27,6 +27,7 @@ parse_arguments() { --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;; --no-strip) STRIP=0 ;; --machine=*) MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;; + --platform=*) echo "Ignoring argument '$arg', continuing" ;; --silent) SILENT=1 ;; *) echo "Unknown argument '$arg'" diff --git a/support-files/MySQL-shared-compat.spec.sh b/support-files/MySQL-shared-compat.spec.sh index 068daadab58..d851873e687 100644 --- a/support-files/MySQL-shared-compat.spec.sh +++ b/support-files/MySQL-shared-compat.spec.sh @@ -26,7 +26,7 @@ # # Change this to match the version of the shared libs you want to include # -%define version4 @MYSQL_NO_DASH_VERSION@ +%define version40 @MYSQL_NO_DASH_VERSION@ %define version3 3.23.58 Name: MySQL-shared-compat @@ -36,13 +36,13 @@ License: GPL Group: Applications/Databases URL: http://www.mysql.com/ Autoreqprov: on -Version: %{version4} +Version: %{version40} Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: MySQL-shared, mysql-shared Provides: MySQL-shared -Summary: MySQL shared libraries for MySQL %{version4} and %{version3} -Source0: MySQL-shared-%{version4}-0.%{_arch}.rpm +Summary: MySQL shared libraries for MySQL %{version40} and %{version3} +Source0: MySQL-shared-%{version40}-0.%{_arch}.rpm Source1: MySQL-shared-%{version3}-1.%{_arch}.rpm # No need to include the RPMs once more - they can be downloaded seperately # if you want to rebuild this package @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package includes the shared libraries for both MySQL %{version3} and -MySQL %{version4}. Install this package instead of "MySQL-shared", if you +MySQL %{version40}. Install this package instead of "MySQL-shared", if you have applications installed that are dynamically linked against MySQL 3.23.xx but you want to upgrade to MySQL 4.0.xx without breaking the library dependencies. |