From: Marcin Krol Date: Mon, 14 Oct 2013 07:07:47 +0000 (+0000) Subject: - updated sphing to 2.1.2, release 2 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=21dea6bd03987bee67f948a3f2c705b112ea6086;p=packages%2Fmysql.git - updated sphing to 2.1.2, release 2 --- diff --git a/mysql.spec b/mysql.spec index 7bd4cb5..3744507 100644 --- a/mysql.spec +++ b/mysql.spec @@ -35,15 +35,15 @@ Summary(uk.UTF-8): MySQL - швидкий SQL-сервер Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql Version: 5.5.33 -Release: 1 +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/Percona-Server-%{version}-rel%{percona_rel}.tar.gz # Source0-md5: 4a1c053dbdda4bb643f7ab13a9776f34 -Source100: http://www.sphinxsearch.com/files/sphinx-2.0.9-release.tar.gz -# Source100-md5: b5a2ff137c00d8490a5e1107bd0b5903 +Source100: http://www.sphinxsearch.com/files/sphinx-2.1.2-release.tar.gz +# Source100-md5: 3e828fa58e2e6049f02aa6aef3009d48 Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.logrotate @@ -59,6 +59,7 @@ Source13: %{name}-client.conf Source14: my.cnf # from fedora Source15: lib%{name}.version + Patch2: %{name}hotcopy-5.0-5.5.patch Patch3: bug-67402.patch # from fedora @@ -73,6 +74,7 @@ Patch19: %{name}-chain-certs.patch # from fedora Patch20: %{name}-dubious-exports.patch Patch21: bison3.patch +Patch22: bug-66589.patch URL: http://www.mysql.com/products/community/ BuildRequires: bison >= 1.875 BuildRequires: cmake >= 2.6 @@ -486,6 +488,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC. mv sphinx-*/mysqlse storage/sphinx %patch18 -p1 %endif + %patch2 -p1 %patch3 -p1 @@ -498,6 +501,7 @@ mv sphinx-*/mysqlse storage/sphinx %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 # to get these files rebuild [ -f sql/sql_yacc.cc ] && rm sql/sql_yacc.cc @@ -520,7 +524,7 @@ cp -a %{SOURCE15} libmysql/libmysql.version -DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \ -DCOMPILATION_COMMENT="TLD Linux MySQL RPM" \ -DCURSES_INCLUDE_PATH=/usr/include/ncurses \ - %{!?with_systemtap:-DENABLE_DTRACE=ON} \ + %{?with_systemtap:-DENABLE_DTRACE=ON} \ -DFEATURE_SET="community" \ -DINSTALL_LAYOUT=RPM \ -DINSTALL_LIBDIR=%{_lib} \