- up to 5.7.30-33; fix gcc 10 build

[packages/percona-server.git] / percona-server.spec

diff --git a/percona-server.spec b/percona-server.spec
index f2aaecd1baa097b2527d6781cf9ecbe1cbf9de7e..f45a52115e7c4e4ef2b48bc1109a74005dd43862 100644 (file)
--- a/percona-server.spec
+++ b/percona-server.spec
@@ -44,8 +44,7 @@
 %endif
 
 %define                rel     1
-%define                percona_rel     22
-%include       /usr/lib/rpm/macros.perl
+%define                percona_rel     33
 Summary:       Percona Server: a very fast and reliable SQL database engine
 Summary(de.UTF-8):     Percona Server: ist eine SQL-Datenbank
 Summary(fr.UTF-8):     Percona Server: un serveur SQL rapide et fiable
@@ -55,12 +54,12 @@ Summary(ru.UTF-8):  Percona Server - быстрый SQL-сервер
 Summary(uk.UTF-8):     Percona Server - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  Percona Server数据库服务器
 Name:          percona-server
-Version:       5.7.22
+Version:       5.7.30
 Release:       %{percona_rel}.%{rel}
 License:       GPL + Percona Server FLOSS Exception
 Group:         Applications/Databases
 Source0:       https://www.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/%{name}-%{version}-%{percona_rel}.tar.gz
-# Source0-md5: a0b0488015d3d38a77c093b476452722
+# Source0-md5: 33b62c4bfa31009183cf260e17df150c
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}
@@ -82,6 +81,8 @@ Source13:     %{name}-client.conf
 Source14:      my.cnf
 Patch0:                mysql-opt.patch
 Patch1:                mysql-versioning.patch
+Patch2:                mysql-protobuf.patch
+Patch3:                build.patch
 
 Patch11:       mysql-upgrade.patch
 Patch12:       mysql-config.patch
@@ -497,13 +498,15 @@ Ten pakiet zawiera standardowego demona Percona Server NDB CPC.
 
 %if %{with sphinx}
 # http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
-mv sphinx-*/mysqlse storage/sphinx
+%{__mv} sphinx-*/mysqlse storage/sphinx
 %patch17 -p1
 cd storage/sphinx
 %patch18 -p2
 cd ../..
 %endif
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %patch19 -p1
 %patch20 -p1
@@ -524,13 +527,19 @@ cd build
 # (it defaults to first cluster but user may change it to whatever
 # cluster it wants)
 
+%if "%{cc_version}" >= "7.0"
+FALLTHROUGH_OPT="-Wimplicit-fallthrough=0"
+%else
+FALLTHROUGH_OPT=
+%endif
+
 CPPFLAGS="%{rpmcppflags}" \
 %cmake .. \
        -DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \
-       -DCMAKE_C_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
-       -DCMAKE_CXX_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
-       -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
-       -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing -Wimplicit-fallthrough=0" \
+       -DCMAKE_C_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing $FALLTHROUGH_OPT" \
+       -DCMAKE_CXX_FLAGS_DEBUG="-fno-omit-frame-pointer -fno-strict-aliasing $FALLTHROUGH_OPT" \
+       -DCMAKE_C_FLAGS_RELWITHDEBINFO="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing $FALLTHROUGH_OPT -Wno-shadow" \
+       -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing $FALLTHROUGH_OPT -Wno-shadow" \
        -DCOMPILATION_COMMENT="PLD/Linux Distribution Percona Server RPM" \
        -DCURSES_INCLUDE_PATH=/usr/include/ncurses \
        %{?with_systemtap:-DENABLE_DTRACE=ON} \
@@ -559,12 +568,12 @@ CPPFLAGS="%{rpmcppflags}" \
 %if %{without system_boost}
        %{!?with_system_boost:-DWITH_BOOST="$(pwd)/$(ls -1d ../boost_*)"} \
 %endif
-       -DWITH_ZLIB=system \
-       -DWITH_READLINE=system \
-       -DWITH_LZ4=system \
        -DWITH_LIBEVENT=system \
-       -DWITH_PROTOBUF=system \
+       -DWITH_LZ4=system \
        -DWITH_MECAB=system \
+       -DWITH_PROTOBUF=system \
+       -DWITH_READLINE=system \
+       -DWITH_ZLIB=system \
        -DTMPDIR=/var/tmp
 
 %{__make}
@@ -655,16 +664,16 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/{,mysql_}resolve_stack_dump.1
 %{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.sym}
 
 # do not clobber users $PATH
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_plugin
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_upgrade
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/innochecksum
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamchk
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamlog
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisampack
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_plugin
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_upgrade
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/innochecksum
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamchk
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamlog
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisampack
 #mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_fix_privilege_tables
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/my_print_defaults
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/my_print_defaults
 sed -i -e 's#/usr/bin/my_print_defaults#%{_sbindir}/my_print_defaults#g' $RPM_BUILD_ROOT%{_bindir}/mysql_install_db
-mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
+%{__mv} $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
 
 # delete - functionality in initscript / rpm
 # note: mysql_install_db (and thus resolveip) are needed by digikam