[mysql-workbench/f14] update to 5.2.34 (and sync spec with rawhide)

Sat May 28 08:35:30 UTC 2011

commit d6eed7935d6622c4a5e6ff6e14c9d565923949f3
Author: remi <fedora at famillecollet.com>
Date:   Sat May 28 10:35:09 2011 +0200

    update to 5.2.34 (and sync spec with rawhide)

 .gitignore                           |    5 +--
 mysql-workbench-5.2.32-tinyxml.patch |   64 --------------------------------
 mysql-workbench-5.2.34-gcc46.patch   |   11 ++++++
 mysql-workbench-5.2.34-man.patch     |   12 ++++++
 mysql-workbench-5.2.34-tinyxml.patch |   67 ++++++++++++++++++++++++++++++++++
 mysql-workbench.spec                 |   41 +++++++++++++++------
 sources                              |    2 +-
 7 files changed, 123 insertions(+), 79 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e408461..6cbfb99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/mysql-workbench-gpl-5.2.28-src.tar.gz
-/mysql-workbench-gpl-5.2.29-src.tar.gz
-/mysql-workbench-gpl-5.2.30-src.tar.gz
+*~
 /mysql-workbench-gpl-5.2.33b-src.tar.gz
+/mysql-workbench-gpl-5.2.34-src.tar.gz
diff --git a/mysql-workbench-5.2.34-gcc46.patch b/mysql-workbench-5.2.34-gcc46.patch
new file mode 100644
index 0000000..33b708b
--- /dev/null
+++ b/mysql-workbench-5.2.34-gcc46.patch
@@ -0,0 +1,11 @@
+diff -up mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46 mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h
+--- mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h.gcc46	2011-05-28 08:12:31.887897052 +0200
++++ mysql-workbench-gpl-5.2.34-src/modules/db.mysql/src/db_mysql_catalog_report.h	2011-05-28 08:13:10.397054637 +0200
+@@ -10,6 +10,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <cstddef>
+ #include "ctemplate/template.h"
+ 
+ #include "grt/common.h"
diff --git a/mysql-workbench-5.2.34-man.patch b/mysql-workbench-5.2.34-man.patch
new file mode 100644
index 0000000..9a12a74
--- /dev/null
+++ b/mysql-workbench-5.2.34-man.patch
@@ -0,0 +1,12 @@
+diff -up mysql-workbench-gpl-5.2.34-src/ext/mysql-utilities/setup.py.orig mysql-workbench-gpl-5.2.34-src/ext/mysql-utilities/setup.py
+--- mysql-workbench-gpl-5.2.34-src/ext/mysql-utilities/setup.py.orig	2011-05-28 08:32:01.667811328 +0200
++++ mysql-workbench-gpl-5.2.34-src/ext/mysql-utilities/setup.py	2011-05-28 08:32:30.464887518 +0200
+@@ -110,7 +110,7 @@ class install_man(distutils.core.Command
+         self.set_undefined_options('build_sphinx',
+                                    ('build_dir', 'build_dir'),
+                                    )
+-        self.target_dir = os.path.join(self.install_base, 'man')
++        self.target_dir = os.path.join(self.install_base, 'share/man')
+         self.source_dir = os.path.join(self.build_dir, 'man')
+ 
+     def run(self):
diff --git a/mysql-workbench-5.2.34-tinyxml.patch b/mysql-workbench-5.2.34-tinyxml.patch
new file mode 100644
index 0000000..d53b5d8
--- /dev/null
+++ b/mysql-workbench-5.2.34-tinyxml.patch
@@ -0,0 +1,67 @@
+diff -up mysql-workbench-gpl-5.2.34-src/backend/wbprivate/Makefile.am.tinyxml mysql-workbench-gpl-5.2.34-src/backend/wbprivate/Makefile.am
+--- mysql-workbench-gpl-5.2.34-src/backend/wbprivate/Makefile.am.tinyxml	2011-05-24 16:12:57.000000000 +0200
++++ mysql-workbench-gpl-5.2.34-src/backend/wbprivate/Makefile.am	2011-05-28 08:02:15.299247072 +0200
+@@ -13,8 +13,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
+   -I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src\
+   -I$(top_srcdir)/ext/scintilla/include\
+   -I$(top_srcdir)/ext/vsqlite++/include\
+-  -I$(top_srcdir)/ext/vsqlite\
+-  -I$(top_srcdir)/ext/tinyxml
++  -I$(top_srcdir)/ext/vsqlite
+ 
+ libwbprivate_a_SOURCES=\
+ 	model/canvas_floater.cpp\
+@@ -75,11 +74,7 @@ libwbprivate_a_SOURCES=\
+   $(top_srcdir)/frontend/common/grt_code_editor.cpp\
+   $(top_srcdir)/frontend/common/grt_python_debugger.cpp\
+   $(top_srcdir)/frontend/common/plugin_manager_window.cpp\
+-  $(top_srcdir)/frontend/common/plugin_install_window.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxml.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinystr.cpp\
+-  $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp
++  $(top_srcdir)/frontend/common/plugin_install_window.cpp
+ 
+ #BUILT_SOURCES=stdafx.h.gch
+ #stdafx.h.gch: workbench/stdafx.h
+diff -up mysql-workbench-gpl-5.2.34-src/library/forms/Makefile.am.tinyxml mysql-workbench-gpl-5.2.34-src/library/forms/Makefile.am
+--- mysql-workbench-gpl-5.2.34-src/library/forms/Makefile.am.tinyxml	2011-05-24 16:12:55.000000000 +0200
++++ mysql-workbench-gpl-5.2.34-src/library/forms/Makefile.am	2011-05-28 08:01:19.473065610 +0200
+@@ -68,7 +68,7 @@ gtk/src/lf_button.cpp\
+ gtk/src/lf_menu.cpp\
+ gtk/src/lf_menubar.cpp
+ 
+-libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@
++libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@ -ltinyxml
+ 
+ INCLUDES=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_KEYRING_CFLAGS@ @PCRE_CFLAGS@ \
+ -I$(top_srcdir)/library/forms\
+@@ -80,7 +80,6 @@ INCLUDES=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @S
+ -I$(top_srcdir)/ext/vsqlite\
+ -I$(top_srcdir)/library/\
+ -I$(top_srcdir)/ext\
+--I$(top_srcdir)/ext/tinyxml\
+ -I$(top_srcdir)/ext/scintilla/include
+ 
+ 
+diff -up mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am.tinyxml mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am
+--- mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am.tinyxml	2011-05-24 16:12:59.000000000 +0200
++++ mysql-workbench-gpl-5.2.34-src/modules/wb.mysql.import/Makefile.am	2011-05-28 08:00:15.373887490 +0200
+@@ -17,7 +17,6 @@ INCLUDES=\
+ 	-I$(top_srcdir)/library/sql-parser/source/linux\
+ 	-I$(top_srcdir)/ext/vsqlite\
+ 	-I$(top_srcdir)/ext/vsqlite++/include\
+-	-I$(top_srcdir)/ext/tinyxml\
+ 	@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+ 
+ 
+@@ -26,8 +25,4 @@ wb_mysql_import_grt_la_LDFLAGS=-module
+ 
+ wb_mysql_import_grt_la_SOURCES=\
+ 	src/wb_mysql_import.cpp\
+-	src/wb_mysql_import_dbd4.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxml.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinystr.cpp\
+-	$(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp
++	src/wb_mysql_import_dbd4.cpp
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index bb9ea58..11536fe 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%global mw_version 5.2.33b
-%global tarversion gpl-5.2.33b-src
-%global srcversion gpl-5.2.33-src
+%global mw_version 5.2.34
+%global tarversion gpl-5.2.34-src
+%global srcversion gpl-5.2.34-src
 
 # Use system cppconn if a compatible upstream version exists
 #global cppconnver 1.1.0-0.3.bzr895
@@ -27,7 +27,12 @@ Source:    http://gd.tuwien.ac.at/db/mysql/Downloads/MySQLGUITools/%{name}-%{tar
 # !!! This patch use versioned soname (libmysqlcppconn.so.5) !!!
 Patch1:    %{name}-5.2.28-cppconn.patch
 Patch2:    %{name}-5.2.32-ctemplate.patch
-Patch3:    %{name}-5.2.32-tinyxml.patch
+Patch3:    %{name}-5.2.34-tinyxml.patch
+# http://bugs.mysql.com/60603
+Patch4:    %{name}-5.2.34-gcc46.patch
+# redirect man page to /usr/share
+Patch5:    %{name}-5.2.34-man.patch
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pcre-devel >= 3.9
@@ -75,6 +80,13 @@ Conflicts: mysql-workbench-oss
 Conflicts: mysql-workbench-ce
 Conflicts: mysql-workbench-gpl
 Conflicts: mysql-workbench-com-se
+# Old GUI Tools no more maintained
+Obsoletes: mysql-gui-tools < 5.1
+Obsoletes: mysql-administrator < 5.1
+Obsoletes: mysql-query-browser < 5.1
+Provides:  mysql-gui-tools = %{version}
+Provides:  mysql-administrator = %{version}
+Provides:  mysql-query-browser = %{version}
 
 
 %description
@@ -90,7 +102,7 @@ an integrated tools environment for:
 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.0
+Version:        1.0.1
 Release:        0.%{mw_version}%{?dist}
 
 BuildArch:      noarch
@@ -124,6 +136,10 @@ rm -rf ext/ctemplate
 rm -rf library/tinyxml
 %endif
 
+%patch4 -p1 -b .gcc46
+%patch5 -p1 -b .man
+
+
 touch -r COPYING .timestamp4rpm
 %{__sed} -i -e 's/\r//g' COPYING
 touch -r .timestamp4rpm COPYING
@@ -140,6 +156,7 @@ touch po/POTFILES.in
 
 %build
 NOCONFIGURE=yes ./autogen.sh
+export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
 %configure --disable-debug --enable-mysql-utilities
 
 make %{?_smp_mflags}
@@ -156,13 +173,8 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 pushd ext/mysql-utilities
-%{__install} --directory %{buildroot}%{_prefix}/man/man1
+%{__install} --directory %{buildroot}%{_mandir}/man1
 %{__python} setup.py install --skip-profile --root %{buildroot}
-
-%if 0%{?fedora} >= 14
-%{__install} --directory %{buildroot}%{_mandir}
-%{__mv} %{buildroot}%{_prefix}/man/man1 %{buildroot}%{_mandir}/man1
-%endif
 popd
 
 # clean dev files
@@ -216,6 +228,7 @@ update-desktop-database &> /dev/null || :
 %{_bindir}/mysqlprocgrep
 %{_bindir}/mysqlreplicate
 %{_bindir}/mysqlserverclone
+%{_bindir}/mysqlserverinfo
 %{_bindir}/mysqluserclone
 %{python_sitelib}/mysql/utilities
 %{python_sitelib}/mysql_utilities*
@@ -227,6 +240,12 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Mar 23 2011 Remi Collet <Fedora at famillecollet.com> 5.2.34-1
+- update to 5.2.34 Community (OSS) Edition (GPL)
+  http://dev.mysql.com/doc/workbench/en/wb-news-5-2-34.html
+  http://wb.mysql.com/?page_id=49
+- mysql-utilities 1.0.1rc1
+
 * Wed Mar 23 2011 Remi Collet <Fedora at famillecollet.com> 5.2.33b-1
 - update to 5.2.33b Community (OSS) Edition (GPL)
   http://dev.mysql.com/doc/workbench/en/wb-news-5-2-33b.html
diff --git a/sources b/sources
index 3cacd95..7562ddd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-850e081eeaea87a88c408483817e4b1f  mysql-workbench-gpl-5.2.33b-src.tar.gz
+781a4e9f6b5573b06a838d53ddb9136d  mysql-workbench-gpl-5.2.34-src.tar.gz
