[mysql-utilities/f17] - update to 1.3.0 (alpha) http://dev.mysql.com/doc/relnotes/mysql-utilities/en/wb-utils-news-1-3-0

[Remi Collet]

commit f1575874146bd6b7424bfa09080af63612fa0972
Author: Remi Collet <remi at fedoraproject.org>
Date:   Sat Apr 6 09:13:07 2013 +0200

    - update to 1.3.0 (alpha)
      http://dev.mysql.com/doc/relnotes/mysql-utilities/en/wb-utils-news-1-3-0.html
    - move from launchpad to mysql.com
    - new command mysqlfrm
    - mysqluc is now usable
    - man pages provided in upstream tarball

 .gitignore                |    2 +
 mysql-utilities-man.patch |   14 -------
 mysql-utilities.spec      |   86 ++++++++++++++++-----------------------------
 sources                   |    2 +-
 4 files changed, 33 insertions(+), 71 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 14f0484..b73e93f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+clog
 *spec~
 /mysql-utilities-1.0.5.tgz
 /mysql-utilities-1.0.6.tgz
@@ -5,3 +6,4 @@
 /mysql-utilities-1.1.1.tgz
 /mysql-utilities-1.2.0.tgz
 /mysql-utilities-1.2.1.tgz
+/mysql-utilities-1.3.0.tar.gz
diff --git a/mysql-utilities.spec b/mysql-utilities.spec
index c17c283..97f3370 100644
--- a/mysql-utilities.spec
+++ b/mysql-utilities.spec
@@ -5,39 +5,23 @@
 # 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_buildman 0
-%else
-%global with_buildman 0
-%endif
-
 Name:           mysql-utilities
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.3.0
+Release:        1%{?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/301 -O mysql-utilities-1.2.1.tgz
-Source0:        %{name}-%{version}.tgz
-
-# Fix man page destination path
-# http://bugs.mysql.com/68323
-Patch0:         %{name}-man.patch
 
+# Upstream has a mirror redirector for downloads, so the URL is hard to
+# represent statically.  You can get the tarball by following a link from
+# http://dev.mysql.com/downloads/tools/utilities/
+Source0:        %{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python2-devel >= 2.6
 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
 %endif
@@ -46,25 +30,21 @@ 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.
+A package of utilities that are used for maintenance and administration
+of MySQL servers. These utilities encapsulate a set of primitive commands,
+and bundles them so they can be used to perform macro operations with a
+single command.
 
 Documentation:
 http://dev.mysql.com/doc/workbench/en/mysql-utilities.html
 
 
 %prep
-%setup -q -n ~mysql/%{name}/trunk
-
-%patch0 -p0 -b .manpath
+%setup -q
 
 
 %build
-%if %{with_buildman}
-%{__python} setup.py build_man
-%else
-: Minimal man pages will be generated
-%endif
+# nothing to build
 
 
 %install 
@@ -86,35 +66,22 @@ 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
+: Man pages
+%{__python} setup.py install_man --root %{buildroot}
 
 
 %check
 %if "%{python_version}" >= "2.7"
-%{__python} check.py
+export PYTHONPATH=%{buildroot}/%{python_sitelib}
+for unit in unit_tests/test*py
+do
+  %{__python} $unit
+done
 %endif
 
 
 %files
-%doc CHANGES.txt LICENSE.txt
+%doc CHANGES.txt LICENSE.txt README.txt
 %if "%{python_version}" >= "2.7"
 %{_bindir}/mysqlauditadmin
 %{_bindir}/mysqlauditgrep
@@ -126,6 +93,7 @@ rm -f %{buildroot}%{python_sitelib}/mysql/connector
 %{_bindir}/mysqldiff
 %{_bindir}/mysqldiskusage
 %{_bindir}/mysqlfailover
+%{_bindir}/mysqlfrm
 %{_bindir}/mysqlindexcheck
 %{_bindir}/mysqlmetagrep
 %{_bindir}/mysqlprocgrep
@@ -135,18 +103,24 @@ rm -f %{buildroot}%{python_sitelib}/mysql/connector
 %{_bindir}/mysqlrplshow
 %{_bindir}/mysqlserverclone
 %{_bindir}/mysqlserverinfo
-# http://bugs.mysql.com/68322
-%exclude %{_bindir}/mysqluc
+%{_bindir}/mysqluc
 %{_bindir}/mysqluserclone
 %{python_sitelib}/mysql/utilities
 %{python_sitelib}/mysql_utilities*
 %{_mandir}/man1/mysql*
-%exclude %{_mandir}/man1/mysqluc*
 # empty file already provided by mysql-connector-python
 %exclude %{python_sitelib}/mysql/__init*
 
 
 %changelog
+* Sat Apr  6 2013 Remi Collet <remi at fedoraproject.org> - 1.3.0-1
+- update to 1.3.0 (alpha)
+  http://dev.mysql.com/doc/relnotes/mysql-utilities/en/wb-utils-news-1-3-0.html
+- move from launchpad to mysql.com
+- new command mysqlfrm
+- mysqluc is now usable
+- man pages provided in upstream tarball
+
 * 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
diff --git a/sources b/sources
index 8534ea6..806f97a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5413235e1469689f5be01883e9331953  mysql-utilities-1.2.1.tgz
+ae548207f84c3ee830aa527ce37679b2  mysql-utilities-1.3.0.tar.gz