summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2004-07-30 13:52:44 +0200
committerunknown <lenz@mysql.com>2004-07-30 13:52:44 +0200
commitd249218105081335be1c562acedcdff6e1f39a00 (patch)
treeeea66fa8b323c150ed2e9ff76ca6ee13bb706b87 /support-files
parent6fa88eacfafadc6beb4100b4f8f89a83af17da6d (diff)
downloadmariadb-git-d249218105081335be1c562acedcdff6e1f39a00.tar.gz
- added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link
flags to enable static linking (to avoid having a shared lib dependency in the Linux RPMs) - Disabled OpenSSL in the Max RPM sql/Makefile.am: - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link flags to enable static linking (to avoid having a shared lib dependency in the Linux Server RPMs) support-files/mysql.spec.sh: - Disable OpenSSL in the Max RPM
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index d5c43e61f9d..35e8b647522 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -149,7 +149,7 @@ languages and applications need to dynamically load and use MySQL.
%package Max
Release: %{release}
-Summary: MySQL - server with Berkeley DB, OpenSSL, RAID and UDF support
+Summary: MySQL - server with Berkeley DB, RAID and UDF support
Group: Applications/Databases
Provides: mysql-Max
Obsoletes: mysql-Max
@@ -157,7 +157,7 @@ Requires: MySQL >= 4.0
%description Max
Optional MySQL server binary that supports additional features like
-Berkeley DB, OpenSSL, RAID and User Defined Functions (UDFs).
+Berkeley DB, RAID and User Defined Functions (UDFs).
To activate this binary, just install this package in addition to
the standard MySQL package.
@@ -269,7 +269,7 @@ then
fi
BuildMySQL "--enable-shared \
- --with-openssl \
+ --without-openssl \
--with-berkeley-db \
--with-innodb \
--with-raid \
@@ -579,6 +579,11 @@ fi
# The spec file changelog only includes changes made to the spec file
# itself
%changelog
+* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
+
+- disabled OpenSSL in the Max binaries again (the RPM packages were the
+ only exception to this anyway) (BUG 1043)
+
* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
- fixed server postinstall (mysql_install_db was called with the wrong