SPECS (MYSQL_5_0): mysql.spec - merge from AC-branch: build with f...

[glen]

Author: glen                         Date: Tue Dec 11 10:35:47 2007 GMT
Module: SPECS                         Tag: MYSQL_5_0
---- Log message:
- merge from AC-branch: build with federated engine

---- Files affected:
SPECS:
   mysql.spec (1.353.2.22 -> 1.353.2.23) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.353.2.22 SPECS/mysql.spec:1.353.2.23
--- SPECS/mysql.spec:1.353.2.22	Mon Dec 10 09:01:19 2007
+++ SPECS/mysql.spec	Tue Dec 11 11:35:41 2007
@@ -4,13 +4,14 @@
 # - http://bugs.mysql.com/bug.php?id=16470
 #
 # Conditional build:
-%bcond_with	bdb		# Berkeley DB support
+%bcond_without	big_tables	# Support tables with more than 4G rows even on 32 bit platforms
+%bcond_without	federated	# Federated storage engine support
 %bcond_without	innodb		# InnoDB storage engine support
-%bcond_with	sphinx		# Sphinx storage engine support
 %bcond_without	raid		# Without raid
 %bcond_without	ssl		# Without OpenSSL
 %bcond_without	tcpd		# Without libwrap (tcp_wrappers) support
-%bcond_without	big_tables	# Support tables with more than 4G rows even on 32 bit platforms
+%bcond_with	bdb		# Berkeley DB support
+%bcond_with	sphinx		# Sphinx storage engine support
 #
 %include	/usr/lib/rpm/macros.perl
 #define	_snap	20060111
@@ -24,7 +25,7 @@
 Summary(zh_CN):	MySQLĘýžÝżâˇţÎńĆ÷
 Name:		mysql
 Version:	5.0.51
-Release:	1
+Release:	2
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 #Source0:	ftp://ftp.mysql.com/pub/mysql/src/%{name}-%{version}.tar.gz
@@ -506,6 +507,7 @@
 	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	--with-archive-storage-engine \
 	%{?with_sphinx:--with-sphinx-storage-engine} \
+	%{?with_federated:--with-federated-storage-engine} \
 	--with-vio \
 	--with-ndbcluster \
 	--without-readline \
@@ -947,6 +949,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353.2.23  2007-12-11 10:35:41  glen
+- merge from AC-branch: build with federated engine
+
 Revision 1.353.2.22  2007-12-10 08:01:19  glen
 - fix for CVE-2007-5925; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mysql.spec?r1=1.353.2.22&r2=1.353.2.23&f=u