Changes necessary to build version 4.0.28:

- "make_binary_distribution" accepts a dummy "--platform=" argument.

- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.


scripts/make_binary_distribution.sh:
  Newer versions of the release build tools call this with a "--platform=" argument
  which we seem not to need in 4.0, but which makes the tool crash (happened on SCO).
  
  Rather than add another version check into the build tools, just accept a "--platform="
  argument and ignore it, just give a message.
support-files/MySQL-shared-compat.spec.sh:
  The current version of "Do-shared-compat" needs two digits to identify the release families
  (to differ between 4.0 and 4.1), so the variable "version4" must get renamed to "version40".
This commit is contained in:
unknown 2007-01-08 18:33:55 +01:00
parent f168d7d8c8
commit e6e7d0cf45
2 changed files with 6 additions and 5 deletions

View File

@ -27,6 +27,7 @@ parse_arguments() {
--suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;; --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
--no-strip) STRIP=0 ;; --no-strip) STRIP=0 ;;
--machine=*) MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;; --machine=*) MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;;
--platform=*) echo "Ignoring argument '$arg', continuing" ;;
--silent) SILENT=1 ;; --silent) SILENT=1 ;;
*) *)
echo "Unknown argument '$arg'" echo "Unknown argument '$arg'"

View File

@ -26,7 +26,7 @@
# #
# Change this to match the version of the shared libs you want to include # 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 %define version3 3.23.58
Name: MySQL-shared-compat Name: MySQL-shared-compat
@ -36,13 +36,13 @@ License: GPL
Group: Applications/Databases Group: Applications/Databases
URL: http://www.mysql.com/ URL: http://www.mysql.com/
Autoreqprov: on Autoreqprov: on
Version: %{version4} Version: %{version40}
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: MySQL-shared, mysql-shared Obsoletes: MySQL-shared, mysql-shared
Provides: MySQL-shared Provides: MySQL-shared
Summary: MySQL shared libraries for MySQL %{version4} and %{version3} Summary: MySQL shared libraries for MySQL %{version40} and %{version3}
Source0: MySQL-shared-%{version4}-0.%{_arch}.rpm Source0: MySQL-shared-%{version40}-0.%{_arch}.rpm
Source1: MySQL-shared-%{version3}-1.%{_arch}.rpm Source1: MySQL-shared-%{version3}-1.%{_arch}.rpm
# No need to include the RPMs once more - they can be downloaded seperately # No need to include the RPMs once more - they can be downloaded seperately
# if you want to rebuild this package # if you want to rebuild this package
@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
This package includes the shared libraries for both MySQL %{version3} and 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 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 3.23.xx but you want to upgrade to MySQL 4.0.xx without breaking the library
dependencies. dependencies.