rel 6

[packages/mysql.git] / mysql.spec

diff --git a/mysql.spec b/mysql.spec
index 352b3d6764a09537101f2b9b418b12d95aa81363..a60e8b93b538ba49800eef5ec97378fa5d7ea6fa 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -27,7 +27,7 @@ Summary(uk.UTF-8):    MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
 Version:       5.0.96
-Release:       2
+Release:       6
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.0.html#source
@@ -69,12 +69,15 @@ Patch14:    %{name}-bug-16470.patch
 Patch15:       %{name}-system-users.patch
 Patch16:       %{name}-errorlog-no-rename.patch
 Patch18:       %{name}-xtrabackup.patch
+Patch19:       %{name}hotcopy-5.0-5.5.patch
 Patch21:       %{name}-atomic.patch
 Patch22:       %{name}-fix-dummy-thread-race-condition.patch
 # ourdelta
-Patch23:       big_tables_fixlp284123_fixmysql35346.patch
-Patch24:       mysql.init.patch
+Patch23:       big_tables_fixlp284123_fix%{name}35346.patch
+Patch24:       bison3.patch
 Patch25:       %{name}-sslchain.patch
+Patch26:       %{name}-yacc.patch
+Patch27:       community-mysql-dh1024.patch
 # <percona patches, http://www.percona.com/percona-lab.html>
 Patch100:      %{name}-show_patches.patch
 Patch101:      %{name}-microslow_innodb.patch
@@ -145,9 +148,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _localstatedir  /var/lib/mysql
 %define                _mysqlhome      /home/services/mysql
 
-%define                _noautoreqdep   'perl(DBD::mysql)'
 # CFLAGS for innodb are altered
-%undefine      configure_cache
+%unglobal      configure_cache
+
+%define                filterout_c     -Werror=format-security
 
 %define                skip_post_check_so      libndbclient.so.2.0.0
 
@@ -542,6 +546,7 @@ mv sphinx-*/mysqlse sql/sphinx
 %patch15 -p1
 %patch16 -p1
 %{?with_xtrabackup:%patch18 -p1}
+%patch19 -p1
 
 # <percona %patches>
 %patch100 -p1
@@ -571,6 +576,10 @@ mv sphinx-*/mysqlse sql/sphinx
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p1
+
+%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
 
 %build
 %{__libtoolize}
@@ -643,7 +652,7 @@ echo -e "all:\ninstall:\nclean:\nlink_sources:\n" > libmysqld/examples/Makefile
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mysql,ssl/certs/mysql,skel} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mysql,certs/mysql,skel} \
           $RPM_BUILD_ROOT/var/{log/{archive,}/mysql,lib/mysql} \
           $RPM_BUILD_ROOT{%{_infodir},%{_mysqlhome}}
 
@@ -882,7 +891,7 @@ EOF
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mysql
 %attr(754,root,root) /etc/rc.d/init.d/mysql
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql
-%dir /etc/ssl/certs/mysql
+%dir /etc/certs/mysql
 %attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/clusters.conf
 %attr(755,root,root) %{_sbindir}/innochecksum
 %attr(755,root,root) %{_sbindir}/my_print_defaults