[mysql-utilities] - update to 1.3.6 GA - add mysqlauditadmin and mysqlauditgrep on EPEL-6
Remi Collet
remi at fedoraproject.org
Thu Dec 19 07:38:50 UTC 2013
commit c20d00b0a3058c008d9c5983117f9adbeee5bd68
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Dec 19 08:38:55 2013 +0100
- update to 1.3.6 GA
- add mysqlauditadmin and mysqlauditgrep on EPEL-6
.gitignore | 1 +
mysql-utilities.spec | 26 +++++++++++++++-----------
sources | 2 +-
3 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 668721f..a37090a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ clog
/mysql-utilities-1.3.3.tar.gz
/mysql-utilities-1.3.4.tar.gz
/mysql-utilities-1.3.5.tar.gz
+/mysql-utilities-1.3.6.tar.gz
diff --git a/mysql-utilities.spec b/mysql-utilities.spec
index 5fb6311..f599394 100644
--- a/mysql-utilities.spec
+++ b/mysql-utilities.spec
@@ -14,7 +14,7 @@
%global with_python3 0
Name: mysql-utilities
-Version: 1.3.5
+Version: 1.3.6
Release: 1%{?dist}
Summary: MySQL Utilities
@@ -67,33 +67,33 @@ rm -rf build
: Python 2 build - end with this for tests
%{__python} setup.py install --skip-profile --root %{buildroot}
-# http://bugs.mysql.com/68614 - Issue with python 2.6
-%if "%{python_version}" < "2.7"
-: drop commands requiring python 2.7
-rm %{buildroot}%{_bindir}/mysqlauditadmin
-rm %{buildroot}%{_bindir}/mysqlauditgrep
-%endif
-
: Man pages
%{__python} setup.py install_man --root %{buildroot}
%check
%if "%{python_version}" >= "2.7"
+
+: Setup test environment
+ln -s %{python_sitelib}/mysql/connector %{buildroot}/%{python_sitelib}/mysql/connector
+ret=0
export PYTHONPATH=%{buildroot}/%{python_sitelib}
+
for unit in unit_tests/test*py
do
- %{__python} $unit
+ %{__python} $unit || ret=1
done
+
+: Cleanup
+rm %{buildroot}/%{python_sitelib}/mysql/connector
+exit $ret
%endif
%files
%doc CHANGES.txt LICENSE.txt README.txt
-%if "%{python_version}" >= "2.7"
%{_bindir}/mysqlauditadmin
%{_bindir}/mysqlauditgrep
-%endif
%{_bindir}/mysqldbcompare
%{_bindir}/mysqldbcopy
%{_bindir}/mysqldbexport
@@ -121,6 +121,10 @@ done
%changelog
+* Thu Dec 19 2013 Remi Collet <remi at fedoraproject.org> - 1.3.6-1
+- update to 1.3.6 GA
+- add mysqlauditadmin and mysqlauditgrep on EPEL-6
+
* Mon Sep 9 2013 Remi Collet <remi at fedoraproject.org> - 1.3.5-1
- update to 1.3.5 GA
diff --git a/sources b/sources
index 109661c..2deb29d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8629774ab079b32482fe2173445c4b0b mysql-utilities-1.3.5.tar.gz
+3340c775b06c9cbf7de5df57ffb6ce22 mysql-utilities-1.3.6.tar.gz
More information about the scm-commits
mailing list