rpms/mysql
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Some updates for 5.6.21

Browse Source 
Signed-off-by: Bjorn Munch <bjorn.munch@oracle.com>
Signed-off-by: Honza Horak <hhorak@redhat.com>
This commit is contained in:
Bjorn Munch 2014-09-26 13:48:31 +02:00 committed by Honza Horak
parent 7894e5c361
commit c9f01efce7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
community-mysql.spec
View File

@ -59,7 +59,7 @@
Name: %{pkgname} Name: %{pkgname}
Version: 5.6.21 Version: 5.6.21
Release: 1%{?dist} Release: 2%{?dist}
Summary: MySQL client programs and shared libraries Summary: MySQL client programs and shared libraries
Group: Applications/Databases Group: Applications/Databases
URL: http://www.mysql.com URL: http://www.mysql.com
@ -366,10 +366,6 @@ the MySQL sources.
%patch70 -p1 %patch70 -p1
%endif %endif
# Avoid dtrace dep
sed -i -e "1d" mysql-test/std_data/dtrace.d
chmod 0644 mysql-test/std_data/dtrace.d
# Modify tests to pass on all archs # Modify tests to pass on all archs
pushd mysql-test pushd mysql-test
add_test () { add_test () {
@ -425,7 +421,7 @@ mkdir build && pushd build
# The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
# so we can't use %%{_datadir} and so forth here. # so we can't use %%{_datadir} and so forth here.
%cmake .. \ cmake .. \
-DBUILD_CONFIG=mysql_release \ -DBUILD_CONFIG=mysql_release \
-DFEATURE_SET="community" \ -DFEATURE_SET="community" \
-DINSTALL_LAYOUT=RPM \ -DINSTALL_LAYOUT=RPM \
@ -872,7 +868,6 @@ fi
%{_datadir}/aclocal/mysql.m4 %{_datadir}/aclocal/mysql.m4
%{_libdir}/mysql/libmysqlclient.so %{_libdir}/mysql/libmysqlclient.so
%{_libdir}/mysql/libmysqlclient_r.so %{_libdir}/mysql/libmysqlclient_r.so
%{_libdir}/mysql/libmysqlservices.so
%{_mandir}/man1/mysql_config.1* %{_mandir}/man1/mysql_config.1*
%endif %endif
@ -902,6 +897,10 @@ fi
%endif %endif
%changelog %changelog
* Thu Sep 25 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.6.21-2
- Using %%cmake macro break some tests, reverted
- Unwanted dtrace dep fixed upstream
* Wed Sep 24 2014 Honza Horak <hhorak@redhat.com> - 5.6.20-1 * Wed Sep 24 2014 Honza Horak <hhorak@redhat.com> - 5.6.20-1
- Update to MySQL 5.6.21, for various fixes described at - Update to MySQL 5.6.21, for various fixes described at
http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-21.html http://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-21.html