- up to 5.7.31-34

diff --git a/build.patch b/build.patch
index 9968ba49385496dbf9d810f74fef529cc69ca2c2..c89697ac5596ff29206dfd10f7d55e1eb1a16a12 100644 (file)
--- a/build.patch
+++ b/build.patch
@@ -53,29 +53,4 @@ index 19db0d34f..3ed806be4 100644
  # pick language dialect
  set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")
  check_cxx_compiler_flag(-std=c++11 HAVE_STDCXX11)
---- percona-server-5.7.30-33/cmake/build_configurations/compiler_options.cmake~        2020-05-24 21:24:02.000000000 +0200
-+++ percona-server-5.7.30-33/cmake/build_configurations/compiler_options.cmake 2020-05-24 22:56:20.402327716 +0200
-@@ -48,7 +48,10 @@ IF(UNIX)
- 
-   # Default GCC flags
-   IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
-+      SET(COMMON_CXX_FLAGS             "-fabi-version=2 ${COMMON_CXX_FLAGS}")
-+    ENDIF()
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
-@@ -72,7 +75,10 @@ IF(UNIX)
-     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMMON_C_FLAGS}")
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
--    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
-+      SET(COMMON_CXX_FLAGS             "-fabi-version=2 ${COMMON_CXX_FLAGS}")
-+    ENDIF()
-     # GCC 6 has C++14 as default, set it explicitly to the old default.
-     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
-                     OUTPUT_VARIABLE GXX_VERSION)
+

diff --git a/percona-server.spec b/percona-server.spec
index c2da3c18c255047a5b97ffa5ed6ebf5a94103739..8a1d0811651e2394f53b871a7bf8e20e71ca6d79 100644 (file)
--- a/percona-server.spec
+++ b/percona-server.spec
@@ -43,8 +43,8 @@
 %undefine      with_tokudb
 %endif
 
-%define                rel     3
-%define                percona_rel     33
+%define                rel     1
+%define                percona_rel     34
 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
@@ -54,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.30
+Version:       5.7.31
 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: 33b62c4bfa31009183cf260e17df150c
+# Source0-md5: 456b9fb28f2d6c72f135c114e5811808
 Source100:     http://www.sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
 # Source100-md5:       5cac34f3d78a9d612ca4301abfcbd666
 %if %{without system_boost}