packages: mysql/mysql.spec - add sphinx patch, builds now

[glen]

Author: glen                         Date: Sat Jul 24 16:12:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add sphinx patch, builds now

---- Files affected:
packages/mysql:
   mysql.spec (1.486 -> 1.487) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.486 packages/mysql/mysql.spec:1.487
--- packages/mysql/mysql.spec:1.486	Sat Jul 24 16:18:44 2010
+++ packages/mysql/mysql.spec	Sat Jul 24 18:12:27 2010
@@ -72,6 +72,7 @@
 Patch15:	plugin-avoid-version.patch
 Patch16:	%{name}-fix-dummy-thread-race-condition.patch
 Patch17:	%{name}-abi_check.patch
+Patch18:	%{name}-sphinx.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
 Patch100:	%{name}-userstats.patch
 Patch101:	%{name}-microslow.patch
@@ -492,7 +493,9 @@
 %prep
 %setup -q %{?with_sphinx:-a100}
 %if %{with sphinx}
+# http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
 mv sphinx-*/mysqlse storage/sphinx
+%patch18 -p1
 %endif
 %patch0 -p1
 #%{?with_tcpd:%patch1 -p1}  # WHATS PURPOSE OF THIS PATCH?
@@ -703,6 +706,7 @@
 # not needed
 rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/ha_*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/ha_example.*
+rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/sphinx.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -869,6 +873,9 @@
 %dir %{_libdir}/mysql
 %dir %{_libdir}/mysql/plugin
 %attr(755,root,root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so
+%if %{with sphinx}
+#%attr(755,root,root) %{_libdir}/mysql/plugin/sphinx.so
+%endif
 %{_mandir}/man1/innochecksum.1*
 %{_mandir}/man1/my_print_defaults.1*
 %{_mandir}/man1/myisamchk.1*
@@ -1114,6 +1121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.487  2010/07/24 16:12:27  glen
+- add sphinx patch, builds now
+
 Revision 1.486  2010/07/24 14:18:44  glen
 - drop unrecognized options
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.486&r2=1.487&f=u