[mariadb-galera] Rebase to 5.5.38 https://kb.askmonty.org/en/mariadb-5538-changelog/
Honza Horak
hhorak at fedoraproject.org
Tue Jul 29 10:13:58 UTC 2014
commit e96473044332a66cd9d96176c87f6ff33d8c6f5c
Author: Honza Horak <hhorak at redhat.com>
Date: Mon Jul 28 21:24:35 2014 +0200
Rebase to 5.5.38
https://kb.askmonty.org/en/mariadb-5538-changelog/
.gitignore | 1 +
mariadb-galera.spec | 14 ++++++--------
sources | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37ed023..e4c0cf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/mariadb-galera-5.5.36.tar.gz
/mariadb-galera-5.5.37.tar.gz
+/mariadb-galera-5.5.38.tar.gz
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index bf177bd..74f1e12 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -6,8 +6,8 @@
%bcond_with tokudb
Name: mariadb-galera
-Version: 5.5.37
-Release: 3%{?dist}
+Version: 5.5.38
+Release: 1%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@@ -492,9 +492,6 @@ install -p -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_libexecdir}/
mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
install -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf
-# Fix funny permissions that cmake build scripts apply to config files
-chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/config.*.ini
-
# Fix scripts for multilib safety
mv ${RPM_BUILD_ROOT}%{_bindir}/mysql_config ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysql_config
touch ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
@@ -522,7 +519,6 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/mysql_embedded
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/*.a
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/binary-configure
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/magic
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/ndb-config-2-node.ini
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/mysql.server
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}/mysqld_multi.server
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
@@ -861,7 +857,6 @@ fi
%{_mandir}/man1/mysqld_safe.1*
%{_mandir}/man1/mysqlhotcopy.1*
%{_mandir}/man1/mysqlimport.1*
-%{_mandir}/man1/mysqlman.1*
%{_mandir}/man1/mysql_setpermission.1*
%{_mandir}/man1/mysqltest.1*
%{_mandir}/man1/innochecksum.1*
@@ -879,7 +874,6 @@ fi
%{_datadir}/%{name}/mysql_test_data_timezone.sql
%{_datadir}/%{name}/mysql_performance_tables.sql
%{_datadir}/%{name}/my-*.cnf
-%{_datadir}/%{name}/config.*.ini
%{_datadir}/%{name}/wsrep.cnf
%{_datadir}/%{name}/wsrep_notify
@@ -930,6 +924,10 @@ fi
# %{_mandir}/man1/mysql_client_test.1*
%changelog
+* Mon Jul 28 2014 Honza Horak <hhorak at redhat.com> - 1:5.5.38-1
+- Rebase to 5.5.38
+ https://kb.askmonty.org/en/mariadb-5538-changelog/
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.5.37-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 905d315..915e3d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fa1745f0502b7a521d46c2df0e7d85e mariadb-galera-5.5.37.tar.gz
+618aa73d9223ced797067f58b9bfb739 mariadb-galera-5.5.38.tar.gz
More information about the scm-commits
mailing list