[mysql-workbench/f16] update to 5.2.40 with separate mysql-utilities

[Remi Collet]

commit ff7baf1726ac6d9d79e9c8650ef45bc324ffe237
Author: remi <fedora at famillecollet.com>
Date:   Sun May 27 09:47:22 2012 +0200

    update to 5.2.40 with separate mysql-utilities

 .gitignore                            |    9 +---
 mysql-workbench-5.2.34-man.patch      |   12 -----
 mysql-workbench-5.2.36-glib.patch     |   79 -------------------------------
 mysql-workbench-5.2.36-profiles.patch |   24 ---------
 mysql-workbench.spec                  |   84 ++++-----------------------------
 sources                               |    2 +-
 6 files changed, 13 insertions(+), 197 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d41d9d5..a1e690b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,2 @@
-*~
-/mysql-workbench-gpl-5.2.33b-src.tar.gz
-/mysql-workbench-gpl-5.2.34-src.tar.gz
-/mysql-workbench-gpl-5.2.35-src.tar.gz
-/mysql-workbench-gpl-5.2.36-src.tar.gz
-/mysql-workbench-gpl-5.2.37-src.tar.gz
-/mysql-workbench-gpl-5.2.38-src.tar.gz
+*spec~
+/mysql-workbench-gpl-5.2.40-src.tar.gz
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index d36e915..4fabe1d 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -1,9 +1,6 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global mw_version 5.2.38
-%global mw_release 1
-%global tarversion gpl-%{mw_version}-src
-%global srcversion gpl-%{mw_version}-src
+%global tarversion gpl-%{version}-src
 
 # Use system cppconn if a compatible upstream version exists
 #global cppconnver 1.1.0-0.3.bzr895
@@ -13,8 +10,8 @@
 
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
-Version:   %{mw_version}
-Release:   %{mw_release}%{?dist}
+Version:   5.2.40
+Release:   1%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
 
@@ -29,12 +26,6 @@ Source:    http://gd.tuwien.ac.at/db/mysql/Downloads/MySQLGUITools/%{name}-%{tar
 Patch1:    %{name}-5.2.28-cppconn.patch
 Patch2:    %{name}-5.2.32-ctemplate.patch
 Patch3:    %{name}-5.2.36-tinyxml.patch
-# redirect man page to /usr/share
-Patch5:    %{name}-5.2.34-man.patch
-# http://bugs.mysql.com/63705 - Only <glib.h> can be included directly
-Patch6:    %{name}-5.2.36-glib.patch
-# http://bugs.mysql.com/63777 - service startup/shutdown command
-Patch7:    %{name}-5.2.36-profiles.patch
 # http://bugs.mysql.com/63898 - fix for automake >= 1.11.2
 Patch8:    %{name}-5.2.37-automake.patch
 
@@ -108,29 +99,8 @@ an integrated tools environment for:
 * Database Administration (replacing MySQL Administrator)
 
 
-%package -n mysql-utilities
-
-Summary:        Scripts for managing and administering MySQL servers
-# Not yet published (else will be package separatly)
-# see ext/mysql-utilities/CHANGES.txt
-Version:        1.0.3
-Release:        0.%{mw_version}%{?dist}.%{mw_release}
-
-BuildArch:      noarch
-BuildRequires:  python-devel >= 2.4
-%if 0%{?fedora} >= 14
-BuildRequires:  python-sphinx >= 1.0
-%endif
-
-Requires:       mysql-connector-python
-
-%description -n mysql-utilities
-MySQL Utilities contain a collection of scripts useful for managing
-and administering MySQL servers.
-
-
 %prep
-%setup -q -n %{name}-%{srcversion}
+%setup -q -n %{name}-%{tarversion}
 
 %if 0%{?cppconnver:1}
 %patch1 -p1 -b .cppconn
@@ -147,9 +117,6 @@ rm -rf ext/ctemplate
 rm -rf library/tinyxml
 %endif
 
-%patch5 -p1 -b .man
-%patch6 -p1 -b .glib
-%patch7 -p1 -b .profiles
 %patch8 -p1 -b .automake
 
 
@@ -179,22 +146,11 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
 
 make %{?_smp_mflags}
 
-%if 0%{?fedora} >= 14
-pushd ext/mysql-utilities
-%{__python} setup.py build_man
-popd
-%endif
-
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-pushd ext/mysql-utilities
-install --directory %{buildroot}%{_mandir}/man1
-%{__python} setup.py install --skip-profile --root %{buildroot}
-popd
-
 # clean dev files
 echo Cleanup dev file
 find %{buildroot}%{_libdir}/%{name} -name \*.a  -exec rm {} \; -print
@@ -244,33 +200,13 @@ fi
 %exclude %{_datadir}/doc/%{name}
 
 
-%files -n mysql-utilities
-%defattr(-, root, root, -)
-%doc ext/mysql-utilities/*.txt
-%{_bindir}/mysqldbcompare
-%{_bindir}/mysqldbcopy
-%{_bindir}/mysqldbexport
-%{_bindir}/mysqldbimport
-%{_bindir}/mysqldiff
-%{_bindir}/mysqldiskusage
-%{_bindir}/mysqlindexcheck
-%{_bindir}/mysqlmetagrep
-%{_bindir}/mysqlprocgrep
-%{_bindir}/mysqlreplicate
-%{_bindir}/mysqlrplcheck
-%{_bindir}/mysqlserverclone
-%{_bindir}/mysqlserverinfo
-%{_bindir}/mysqluserclone
-%{python_sitelib}/mysql/utilities
-%{python_sitelib}/mysql_utilities*
-%if 0%{?fedora} >= 14
-%{_mandir}/man1/*
-%endif
-# empty file already provided by mysql-connector-python
-%exclude %{python_sitelib}/mysql/__init*
-
-
 %changelog
+* Tue May 27 2012 Remi Collet <remi at fedoraproject.org> 5.2.40-1
+- update to 5.2.40 Community (OSS) Edition (GPL)
+  http://dev.mysql.com/doc/workbench/en/wb-news-5-2-40.html
+- remove patches merged upstream
+- remove mysql-utilities sub-package (available separately)
+
 * Fri Feb 24 2012 Remi Collet <remi at fedoraproject.org> 5.2.38-1
 - update to 5.2.38 Community (OSS) Edition (GPL)
   http://dev.mysql.com/doc/workbench/en/wb-news-5-2-38.html
diff --git a/sources b/sources
index 1d13693..b67a4f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd2a0cec9dffd5465b6999f5d9c8de78  mysql-workbench-gpl-5.2.38-src.tar.gz
+ac5c2058cd39c796a1c7bed2647f74b6  mysql-workbench-gpl-5.2.40-src.tar.gz