[packages/mysql] - up to 5.5.33; link patch looks unneded (builds fine without and with systemtap bcond)
arekm
arekm at pld-linux.org
Fri Sep 20 13:29:25 CEST 2013
commit 3a87ece6374beeb8390d31479c7c6c94cf11e07f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Sep 20 13:29:22 2013 +0200
- up to 5.5.33; link patch looks unneded (builds fine without and with systemtap bcond)
mysql-link.patch | 45 ---------------------------------------------
mysql.spec | 11 +++++------
2 files changed, 5 insertions(+), 51 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 4dd93f1..e3ad45d 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -23,7 +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 31.0
+%define percona_rel 31.1
%include /usr/lib/rpm/macros.perl
Summary: MySQL: a very fast and reliable SQL database engine
Summary(de.UTF-8): MySQL: ist eine SQL-Datenbank
@@ -34,14 +34,14 @@ Summary(ru.UTF-8): MySQL - быстрый SQL-сервер
Summary(uk.UTF-8): MySQL - швидкий SQL-сервер
Summary(zh_CN.UTF-8): MySQL数据库服务器
Name: mysql
-Version: 5.5.32
-Release: 3
+Version: 5.5.33
+Release: 1
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/Percona-Server-%{version}-rel%{percona_rel}.tar.gz
-# Source0-md5: aafbc2a94353d68b5cbfbeddb7eb2e08
+# Source0-md5: 4a1c053dbdda4bb643f7ab13a9776f34
Source100: http://www.sphinxsearch.com/files/sphinx-2.0.8-release.tar.gz
# Source100-md5: bcaf0af0ba403a43b9ef3af6f9599cb4
Source1: %{name}.init
@@ -59,7 +59,6 @@ Source13: %{name}-client.conf
Source14: my.cnf
# from fedora
Source15: lib%{name}.version
-Patch0: %{name}-link.patch
Patch2: %{name}hotcopy-5.0-5.5.patch
Patch3: bug-67402.patch
# from fedora
@@ -491,7 +490,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
mv sphinx-*/mysqlse storage/sphinx
%patch18 -p1
%endif
-%patch0 -p1
+
%patch2 -p1
%patch3 -p1
diff --git a/mysql-link.patch b/mysql-link.patch
deleted file mode 100644
index ecdaaed..0000000
--- a/mysql-link.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Workaround for: https://bugs.launchpad.net/percona-server/+bug/747152
-
-When linking plugins which are linked to libraries already linked with
-probes_mysql.o, skip adding (second) probes_mysql.o .
-
---- Percona-Server-5.5.32-rel31.0/cmake/plugin.cmake.orig 2013-07-01 05:16:34.000000000 +0200
-+++ Percona-Server-5.5.32-rel31.0/cmake/plugin.cmake 2013-07-12 17:57:12.120001411 +0200
-@@ -47,7 +47,7 @@
- MACRO(MYSQL_ADD_PLUGIN)
- MYSQL_PARSE_ARGUMENTS(ARG
- "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
-- "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED"
-+ "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;SKIP_PROBES"
- ${ARGN}
- )
-
-@@ -170,7 +170,9 @@
-
- ADD_VERSION_INFO(${target} MODULE SOURCES)
- ADD_LIBRARY(${target} MODULE ${SOURCES})
-+ IF(NOT ARG_SKIP_PROBES)
- DTRACE_INSTRUMENT(${target})
-+ ENDIF()
- SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX ""
- COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
- TARGET_LINK_LIBRARIES (${target} mysqlservices)
---- Percona-Server-5.5.32-rel31.0/storage/sphinx/CMakeLists.txt.orig 2012-11-05 12:48:48.000000000 +0100
-+++ Percona-Server-5.5.32-rel31.0/storage/sphinx/CMakeLists.txt 2013-07-12 17:57:36.740000378 +0200
-@@ -12,5 +12,5 @@
- ADD_LIBRARY(sphinx ha_sphinx.cc snippets_udf.cc)
- ELSE()
- SET(SPHINX_PLUGIN_DYNAMIC "ha_sphinx")
--MYSQL_ADD_PLUGIN(sphinx ${SPHINX_SOURCES} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES mysys)
-+MYSQL_ADD_PLUGIN(sphinx ${SPHINX_SOURCES} STORAGE_ENGINE MODULE_ONLY SKIP_PROBES LINK_LIBRARIES mysys)
- ENDIF()
---- Percona-Server-5.5.32-rel31.0/plugin/percona-pam-for-mysql/CMakeLists.txt.orig 2013-07-01 05:16:34.000000000 +0200
-+++ Percona-Server-5.5.32-rel31.0/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-07-12 18:28:41.576588784 +0200
-@@ -31,6 +31,6 @@
- SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c)
- MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
- MYSQL_ADD_PLUGIN(auth_pam_compat ${AUTH_PAM_COMPAT_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
-- MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY)
-+ MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY SKIP_PROBES)
- ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
- ENDIF(WITH_PAM)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/3a87ece6374beeb8390d31479c7c6c94cf11e07f
More information about the pld-cvs-commit
mailing list