Update to 10.1.13

This commit is contained in:
Jakub Dorňák 2016-03-29 10:29:29 +02:00
parent 3699d693be
commit 77ceff32b6
3 changed files with 10 additions and 7 deletions

View File

@ -1,8 +1,7 @@
Improve the documentation that will be installed in the mysql-test RPM. Improve the documentation that will be installed in the mysql-test RPM.
diff -up mariadb-10.0.10/mysql-test/README.p3 mariadb-10.0.10/mysql-test/README --- mariadb-10.1.13/mysql-test/README.orig 2016-03-24 10:12:10.000000000 +0100
--- mariadb-10.0.10/mysql-test/README.p3 2014-04-07 16:05:51.402631548 +0200 +++ mariadb-10.1.13/mysql-test/README 2016-03-29 10:23:30.074326900 +0200
+++ mariadb-10.0.10/mysql-test/README 2014-04-07 16:06:06.137637991 +0200
@@ -1,15 +1,28 @@ @@ -1,15 +1,28 @@
-This directory contains a test suite for the MySQL daemon. To run -This directory contains a test suite for the MySQL daemon. To run
-the currently existing test cases, simply execute ./mysql-test-run in -the currently existing test cases, simply execute ./mysql-test-run in
@ -42,7 +41,7 @@ diff -up mariadb-10.0.10/mysql-test/README.p3 mariadb-10.0.10/mysql-test/README
+If one or more tests fail on your system, please read the following manual +If one or more tests fail on your system, please read the following manual
+section for instructions on how to report the problem: +section for instructions on how to report the problem:
http://kb.askmonty.org/v/reporting-bugs https://mariadb.com/kb/en/reporting-bugs
@@ -26,7 +39,8 @@ other relevant options. @@ -26,7 +39,8 @@ other relevant options.

View File

@ -119,11 +119,11 @@
# Make long macros shorter # Make long macros shorter
%global sameevr %{epoch}:%{version}-%{release} %global sameevr %{epoch}:%{version}-%{release}
%global compatver 10.1 %global compatver 10.1
%global bugfixver 12 %global bugfixver 13
Name: mariadb Name: mariadb
Version: %{compatver}.%{bugfixver} Version: %{compatver}.%{bugfixver}
Release: 4%{?with_debug:.debug}%{?dist} Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 1 Epoch: 1
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
@ -786,6 +786,7 @@ install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}}
install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}} install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
# install galera config file # install galera config file
sed -r 's|^wsrep_provider=none|wsrep_provider=/usr/lib64/galera/libgalera_smm.so|'
install -p -m 0644 support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf install -p -m 0644 support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
# install the clustercheck script # install the clustercheck script
@ -1244,6 +1245,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Mar 29 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.13-1
- Update to 10.1.13
* Wed Mar 23 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.12-4 * Wed Mar 23 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.12-4
- Fixed conflict with mariadb-galera-server - Fixed conflict with mariadb-galera-server

View File

@ -1 +1 @@
a2c0809f27ec112139c2c50f03569b2b mariadb-10.1.12.tar.gz aa881ff81a181c7357a90b8a357dee7c mariadb-10.1.13.tar.gz