Merge branch 'master' into f22

This commit is contained in:
Honza Horak 2015-05-11 10:22:57 +02:00
commit 98df51dcdc
3 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/mariadb-10.0.16.tar.gz /mariadb-10.0.16.tar.gz
/mariadb-10.0.17.tar.gz /mariadb-10.0.17.tar.gz
/mariadb-10.0.18.tar.gz /mariadb-10.0.18.tar.gz
/mariadb-10.0.19.tar.gz

View File

@ -113,7 +113,7 @@
# Make long macros shorter # Make long macros shorter
%global sameevr %{epoch}:%{version}-%{release} %global sameevr %{epoch}:%{version}-%{release}
%global compatver 10.0 %global compatver 10.0
%global bugfixver 18 %global bugfixver 19
Name: mariadb Name: mariadb
Version: %{compatver}.%{bugfixver} Version: %{compatver}.%{bugfixver}
@ -1150,10 +1150,13 @@ fi
%endif %endif
%changelog %changelog
* Mon May 11 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.19-1
- Update to 10.0.19
* Thu May 07 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.18-1 * Thu May 07 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.18-1
- Update to 10.0.18 - Update to 10.0.18
* Fri May 07 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.17-4 * Thu May 07 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.17-4
- Include client plugins into -common package since they are used by both -libs - Include client plugins into -common package since they are used by both -libs
and base packages. and base packages.
- Do not use libedit - Do not use libedit

View File

@ -1 +1 @@
eab4f9303883d33558c0059af9e30aa4 mariadb-10.0.18.tar.gz aeaf101c688515dc8f73a5250e6c1df9 mariadb-10.0.19.tar.gz