[mariadb] Update to 10.0.14
Honza Horak
hhorak at fedoraproject.org
Mon Sep 29 15:20:25 UTC 2014
commit 00534d9ccca5122db1125fc09c1f1cecf370cde8
Author: Honza Horak <hhorak at redhat.com>
Date: Mon Sep 29 17:19:52 2014 +0200
Update to 10.0.14
.gitignore | 1 +
mariadb.spec | 11 +++++++----
mysql-check-upgrade.sh | 2 +-
mysql-prepare-db-dir.sh | 2 +-
sources | 2 +-
5 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f144d4..314f72e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/mariadb-10.0.11.tar.gz
/mariadb-10.0.12.tar.gz
/mariadb-10.0.13.tar.gz
+/mariadb-10.0.14.tar.gz
diff --git a/mariadb.spec b/mariadb.spec
index 73bb979..84ba44c 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -97,11 +97,11 @@
# Make long macros shorter
%global sameevr %{epoch}:%{version}-%{release}
%global compatver 10.0
-%global bugfixver 13
+%global bugfixver 14
Name: %{pkgname}
Version: %{compatver}.%{bugfixver}
-Release: 8%{?dist}
+Release: 1%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@@ -632,8 +632,8 @@ install -p -m 0755 scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_co
# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
# but that's pretty wacko --- see also %%{name}-file-contents.patch)
-mv %{buildroot}%{_pkgdocdir}/MariaDB-server-%{version}/INFO_SRC %{buildroot}%{_libdir}/mysql/
-mv %{buildroot}%{_pkgdocdir}/MariaDB-server-%{version}/INFO_BIN %{buildroot}%{_libdir}/mysql/
+install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/
+install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/
rm -rf %{buildroot}%{_pkgdocdir}/MariaDB-server-%{version}/
mkdir -p %{buildroot}%{logfiledir}
@@ -1155,6 +1155,9 @@ fi
%endif
%changelog
+* Mon Sep 29 2014 Honza Horak <hhorak at redhat.com> - 1:10.0.14-1
+- Update to 10.0.14
+
* Wed Sep 24 2014 Honza Horak <hhorak at redhat.com> - 1:10.0.13-8
- Move connect engine to a separate package
Rename oqgraph engine to align with upstream packages
diff --git a/mysql-check-upgrade.sh b/mysql-check-upgrade.sh
index 8fefe6b..9c8a8bd 100644
--- a/mysql-check-upgrade.sh
+++ b/mysql-check-upgrade.sh
@@ -29,7 +29,7 @@ The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool.
1. Back-up your data before running 'mysql_upgrade'
2. Start the database daemon using 'systemctl start @DAEMON_NAME at .service'
- 3. Run 'mysql_upgrade' with a database user that has sufficent privileges
+ 3. Run 'mysql_upgrade' with a database user that has sufficient privileges
Read more about 'mysql_upgrade' usage at:
https://mariadb.com/kb/en/mariadb/documentation/sql-commands/table-commands/mysql_upgrade/
diff --git a/mysql-prepare-db-dir.sh b/mysql-prepare-db-dir.sh
index 67fe919..1905f09 100644
--- a/mysql-prepare-db-dir.sh
+++ b/mysql-prepare-db-dir.sh
@@ -81,7 +81,7 @@ if [ ! -d "$datadir/mysql" ] ; then
exit $ret
fi
# upgrade does not need to be run on a fresh datadir
- echo "@MYSQL_VERSION_ID@" >"$datadir/mysql_upgrade_info"
+ echo "@VERSION at -MariaDB" >"$datadir/mysql_upgrade_info"
# In case we're running as root, make sure files are owned properly
chown -R "$myuser:$mygroup" "$datadir"
fi
diff --git a/sources b/sources
index c3664dc..211343f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b2e88864b51d7d0607dc37abb8a0adb mariadb-10.0.13.tar.gz
+80fea71de54a9cfa7f5508df53d3f06d mariadb-10.0.14.tar.gz
More information about the scm-commits
mailing list