Builds again.

[packages/mysql.git] / mysql.spec

diff --git a/mysql.spec b/mysql.spec
index 7698b14f027343e2ed5288eb42f0e2039080cd85..7f2fa7eff3c4fe9215460d4b1375ce2b416ec538 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,8 +23,7 @@
 %bcond_with    tests           # FIXME: don't run correctly
 %bcond_with    ndb             # NDB is now a separate product, this here is broken, so disable it
 
-%define        percona_rel     37.3
-%include       /usr/lib/rpm/macros.perl
+%define        percona_rel     38.14
 Summary:       MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     MySQL: ist eine SQL-Datenbank
 Summary(fr.UTF-8):     MySQL: un serveur SQL rapide et fiable
@@ -34,16 +33,16 @@ Summary(ru.UTF-8):  MySQL - быстрый SQL-сервер
 Summary(uk.UTF-8):     MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
-Version:       5.5.44
-Release:       1
+Version:       5.5.62
+Release:       2
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
 # Source0:     http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/%{name}-%{version}.tar.gz
 Source0:       http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/percona-server-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: 8046bba9e09d268c9e56b47c481c975f
-Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.9-release.tar.gz
-# Source100-md5:       1fcc3d180c0559bdeb93602ef248caf4
+# Source0-md5: 45d793f1886528fa64675e1c12b54796
+Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
+# Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.logrotate
@@ -59,7 +58,7 @@ Source13:     %{name}-client.conf
 Source14:      my.cnf
 # from fedora
 Source15:      lib%{name}.version
-
+Patch0:                x32.patch
 Patch2:                %{name}hotcopy-5.0-5.5.patch
 Patch3:                bug-67402.patch
 # from fedora
@@ -103,7 +102,7 @@ Requires(pre):      /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(triggerpostun):       sed >= 4.0
+Requires(postun):      sed >= 4.0
 Requires:      %{name}-charsets = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      /usr/bin/setsid
@@ -499,6 +498,8 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch18 -p1
 %endif
 
+%patch0 -p1
+
 %patch2 -p1
 %patch3 -p1
 
@@ -507,7 +508,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch9 -p1
 %patch11 -p1
 %patch12 -p1
-%patch14 -p0
+%patch14 -p1
 %patch19 -p1
 %patch20 -p1
 
@@ -550,6 +551,7 @@ cp -a %{SOURCE15} libmysql/libmysql.version
        -DINSTALL_SQLBENCHDIR=%{_datadir} \
        -DINSTALL_SUPPORTFILESDIR=share/%{_orgname}-support \
        -DINSTALL_MYSQLSHAREDIR=share/%{_orgname} \
+       -DINSTALL_SECURE_FILE_PRIVDIR="" \
        -DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \
        %{?debug:-DWITH_DEBUG=ON} \
        -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
@@ -560,6 +562,7 @@ cp -a %{SOURCE15} libmysql/libmysql.version
        -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
        -DWITH_PIC=ON \
        -DWITH_READLINE=OFF \
+       -DWITH_SCALABILITY_METRICS=ON \
 %if "%{pld_release}" == "ac"
        -DWITH_SSL=%{?with_ssl:bundled}%{!?with_ssl:no} \
 %else
@@ -671,10 +674,6 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
 
 # we don't package those (we have no -test or -testsuite pkg) and some of them just segfault
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_client_test
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_client_test.1*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_client_test_embedded.1*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql-stress-test.pl.1*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql-test-run.pl.1*
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mysql-test
 
 # not needed
@@ -742,7 +741,8 @@ fi
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%triggerpostun -- mysql < 4.0.20-2.4
+%triggerpostun -- mysql < 5.5.0
+# < 4.0.20-2.4
 # For clusters in /etc/%{name}/clusters.conf
 if [ -f /etc/sysconfig/mysql ]; then
        . /etc/sysconfig/mysql
@@ -757,7 +757,7 @@ if [ -f /etc/sysconfig/mysql ]; then
        fi
 fi
 
-%triggerpostun -- mysql < 4.1.1
+# mysql < 4.1.1
 # For better compatibility with prevoius versions:
 for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
        if echo "$config" | grep -q '^/'; then
@@ -796,7 +796,7 @@ done
 EOF
 #'
 
-%triggerpostun -- mysql < 5.1.0
+# < 5.1.0
 configs=""
 for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
        if echo "$config" | grep -q '^/'; then
@@ -835,7 +835,7 @@ for config in $configs; do
 done
 ) | %banner -e %{name}-5.1
 
-%triggerpostun -- mysql < 5.5.0
+# < 5.5.0
 configs=""
 for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
        if echo "$config" | grep -q '^/'; then
@@ -1086,8 +1086,6 @@ done
 %{_datadir}/sql-bench/[CDRl]*
 %attr(755,root,root) %{_datadir}/sql-bench/[bcgirst]*
 %{_mandir}/man1/mysqlslap.1*
-%{_mandir}/man1/mysqltest.1*
-%{_mandir}/man1/mysqltest_embedded.1*
 
 #%files doc
 #%defattr(644,root,root,755)