[mysql-utilities/f17] - update to 1.2.1 - generate minimal man pages using help2man http://bugs.mysql.com/68610 - Missing

Fri Mar 8 11:49:43 UTC 2013

commit 1681a1030bb6cba398705844b110ad2d2b24a5c5
Author: Remi Collet <rcollet at redhat.com>
Date:   Fri Mar 8 12:49:38 2013 +0100

    - update to 1.2.1
    - generate minimal man pages using help2man http://bugs.mysql.com/68610 - Missing man pages
    - drop mysqlauditadmin and mysqlauditgrep on EPEL-6 http://bugs.mysql.com/68614 - Issue with python 2.6

 .gitignore           |    1 +
 mysql-utilities.spec |   74 +++++++++++++++++++++++++++++++++++++++-----------
 sources              |    2 +-
 3 files changed, 60 insertions(+), 17 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index ada73fc..14f0484 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /mysql-utilities-1.1.0.tgz
 /mysql-utilities-1.1.1.tgz
 /mysql-utilities-1.2.0.tgz
+/mysql-utilities-1.2.1.tgz
diff --git a/mysql-utilities.spec b/mysql-utilities.spec
index a8e7a08..c17c283 100644
--- a/mysql-utilities.spec
+++ b/mysql-utilities.spec
@@ -1,35 +1,42 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_version: %global python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")}
 
 # From README.txt
 # Python 2.6 or later but Python 3.x is not supported (yet).
 %global with_python3 0
 
+# http://bugs.mysql.com/68610 - Missing man pages
 %if 0%{?fedora} >= 14
-%global with_man 1
+%global with_buildman 0
 %else
-%global with_man 0
+%global with_buildman 0
 %endif
 
 Name:           mysql-utilities
-Version:        1.2.0
-Release:        1%{?dist}
+Version:        1.2.1
+Release:        2%{?dist}
 Summary:        MySQL Utilities
 
 Group:          Applications/Databases
 License:        GPLv2
 URL:            https://launchpad.net/mysql-utilities
-# wget http://bazaar.launchpad.net/~mysql/mysql-utilities/trunk/tarball/280 -O mysql-utilities-1.2.0.tgz
+# wget http://bazaar.launchpad.net/~mysql/mysql-utilities/trunk/tarball/301 -O mysql-utilities-1.2.1.tgz
 Source0:        %{name}-%{version}.tgz
 
 # Fix man page destination path
-# Remove mut man page
+# http://bugs.mysql.com/68323
 Patch0:         %{name}-man.patch
 
 
 BuildArch:      noarch
 BuildRequires:  python2-devel >= 2.6
-%if %{with_man}
+BuildRequires:  mysql-connector-python
+%if %{with_buildman}
+# Man pages generated by upstream setup.py
 BuildRequires:  python-sphinx >= 1.0
+%else
+# To generate our minimal man pages
+BuildRequires:  help2man
 %endif
 %if %{with_python3}
 BuildRequires:  python3-devel
@@ -37,6 +44,7 @@ BuildRequires:  python3-devel
 
 Requires:       mysql-connector-python
 
+
 %description
 The MySQL Utilities is a set of easy-to-use scripts intended to make working
 with servers easier. It is part of the MySQL Workbench.
@@ -52,10 +60,10 @@ http://dev.mysql.com/doc/workbench/en/mysql-utilities.html
 
 
 %build
-%if %{with_man}
+%if %{with_buildman}
 %{__python} setup.py build_man
 %else
-: No man will be generated
+: Minimal man pages will be generated
 %endif
 
 
@@ -63,26 +71,54 @@ http://dev.mysql.com/doc/workbench/en/mysql-utilities.html
 install --directory %{buildroot}%{_mandir}/man1
 
 %if %{with_python3}
-# Python 3 build
+: Python 3 build
 %{__python3} setup.py install --skip-profile --root %{buildroot}
 rm -rf build
 %endif
 
-# Python 2 build (end with this for tests)
+: 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
+
+%if ! %{with_buildman}
+: Generate minimal man pages
+
+export PYTHONPATH=%{buildroot}/%{python_sitelib}
+ls -l %{python_sitelib}/mysql/connector
+ln -s %{python_sitelib}/mysql/connector \
+      %{buildroot}%{python_sitelib}/mysql/connector
+
+for cmd in %{buildroot}%{_bindir}/*
+do
+  %{__python} $cmd --version
+  name=$(basename $cmd)
+  help2man --no-info \
+           --output %{buildroot}%{_mandir}/man1/$name.1 \
+           "%{__python} $cmd"
+done
+
+rm -f %{buildroot}%{python_sitelib}/mysql/connector
+%endif
 
-%check
-# we don't have mysql_config_editor.
-rm unit_tests/test_my_print_defaults.py
 
+%check
+%if "%{python_version}" >= "2.7"
 %{__python} check.py
+%endif
 
 
 %files
 %doc CHANGES.txt LICENSE.txt
+%if "%{python_version}" >= "2.7"
 %{_bindir}/mysqlauditadmin
 %{_bindir}/mysqlauditgrep
+%endif
 %{_bindir}/mysqldbcompare
 %{_bindir}/mysqldbcopy
 %{_bindir}/mysqldbexport
@@ -99,19 +135,25 @@ rm unit_tests/test_my_print_defaults.py
 %{_bindir}/mysqlrplshow
 %{_bindir}/mysqlserverclone
 %{_bindir}/mysqlserverinfo
+# http://bugs.mysql.com/68322
 %exclude %{_bindir}/mysqluc
 %{_bindir}/mysqluserclone
 %{python_sitelib}/mysql/utilities
 %{python_sitelib}/mysql_utilities*
-%if %{with_man}
 %{_mandir}/man1/mysql*
 %exclude %{_mandir}/man1/mysqluc*
-%endif
 # empty file already provided by mysql-connector-python
 %exclude %{python_sitelib}/mysql/__init*
 
 
 %changelog
+* Fri Mar  8 2013 Remi Collet <remi at fedoraproject.org> - 1.2.1-2
+- generate minimal man pages using help2man
+  http://bugs.mysql.com/68610 - Missing man pages
+- drop mysqlauditadmin and mysqlauditgrep on EPEL-6
+  http://bugs.mysql.com/68614 - Issue with python 2.6
+- update to 1.2.1
+
 * Fri Feb  8 2013 Remi Collet <remi at fedoraproject.org> - 1.2.0-1
 - update to 1.2.0
 - new commands: mysqlauditadmin and mysqlauditgrep
diff --git a/sources b/sources
index 73fd19e..8534ea6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8361536f546cc8664645d1b06cf4de55  mysql-utilities-1.2.0.tgz
+5413235e1469689f5be01883e9331953  mysql-utilities-1.2.1.tgz
