SPECS (MYSQL_5_0): mysql.spec - add sphinx storage engine support

[glen]

Author: glen                         Date: Thu Mar 15 18:01:06 2007 GMT
Module: SPECS                         Tag: MYSQL_5_0
---- Log message:
- add sphinx storage engine support

---- Files affected:
SPECS:
   mysql.spec (1.353.2.6 -> 1.353.2.7) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.353.2.6 SPECS/mysql.spec:1.353.2.7
--- SPECS/mysql.spec:1.353.2.6	Fri Mar  9 11:28:14 2007
+++ SPECS/mysql.spec	Thu Mar 15 19:01:01 2007
@@ -5,7 +5,8 @@
 #
 # Conditional build:
 %bcond_with	bdb		# Berkeley DB support
-%bcond_without	innodb		# Without InnoDB 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
@@ -29,6 +30,8 @@
 #Source0:	ftp://ftp.mysql.com/pub/mysql/src/%{name}-%{version}.tar.gz
 Source0:	http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
 # Source0-md5:	26ed76facb58bdeae40c8310e337dde2
+Source100:	http://www.sphinxsearch.com/downloads/sphinx-0.9.7-rc2.tar.gz
+# Source100-md5:	65daf0feb7e276fb3de0aba82cff1d3e
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.logrotate
@@ -42,7 +45,7 @@
 Source12:	%{name}-ndb-cpc.sysconfig
 Source13:	%{name}-client.conf
 Patch0:		%{name}-libs.patch
-
+Patch1:		%{name}-sphinx.patch
 Patch2:		%{name}-c++.patch
 Patch3:		%{name}-info.patch
 Patch4:		%{name}-sql-cxx-pic.patch
@@ -431,9 +434,12 @@
 Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 
 %prep
-%setup -q %{?_snap:-n %{name}-%{version}-nightly-%{_snap}}
+%setup -q %{?_snap:-n %{name}-%{version}-nightly-%{_snap}} %{?with_sphinx:-a100}
 %patch0 -p1
-
+%if %{with sphinx}
+mv sphinx-*/mysqlse sql/sphinx
+%patch1 -p1
+%endif
 %patch2 -p1
 %patch3 -p1
 %ifarch alpha
@@ -493,6 +499,7 @@
 	--with-named-thread-libs="-lpthread" \
 	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	--with-archive-storage-engine \
+	%{?with_sphinx:--with-sphinx-storage-engine} \
 	--with-vio \
 	--with-ndbcluster \
 	--without-readline \
@@ -596,6 +603,8 @@
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/safe_mysqld*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1*
+rm $RPM_BUILD_ROOT%{_mandir}/man1/make_win_bin_dist.1
+rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_install_db.1
 
 # in %doc
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.{ini,cnf}
@@ -903,6 +912,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353.2.7  2007/03/15 18:01:01  glen
+- add sphinx storage engine support
+
 Revision 1.353.2.6  2007/03/09 10:28:14  arekm
 - up to 5.0.37-community
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.353.2.6&r2=1.353.2.7&f=u