From adc9d92d0f127bf210391bf34304ffd91bbd750f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 10 Dec 2011 08:34:20 +0100 Subject: MySQL Workbench 5.2.36 --- mysql-workbench-5.2.34-tinyxml.patch | 67 ------------------------------------ mysql-workbench-5.2.36-tinyxml.patch | 67 ++++++++++++++++++++++++++++++++++++ mysql-workbench.spec | 17 ++++++--- 3 files changed, 79 insertions(+), 72 deletions(-) delete mode 100644 mysql-workbench-5.2.34-tinyxml.patch create mode 100644 mysql-workbench-5.2.36-tinyxml.patch diff --git a/mysql-workbench-5.2.34-tinyxml.patch b/mysql-workbench-5.2.34-tinyxml.patch deleted file mode 100644 index d53b5d8..0000000 --- a/mysql-workbench-5.2.34-tinyxml.patch +++ /dev/null @@ -1,67 +0,0 @@ -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-5.2.36-tinyxml.patch b/mysql-workbench-5.2.36-tinyxml.patch new file mode 100644 index 0000000..85da580 --- /dev/null +++ b/mysql-workbench-5.2.36-tinyxml.patch @@ -0,0 +1,67 @@ +diff -up mysql-workbench-gpl-5.2.36-src/backend/wbprivate/Makefile.am.tinyxml mysql-workbench-gpl-5.2.36-src/backend/wbprivate/Makefile.am +--- mysql-workbench-gpl-5.2.36-src/backend/wbprivate/Makefile.am.tinyxml 2011-12-02 12:37:03.000000000 +0100 ++++ mysql-workbench-gpl-5.2.36-src/backend/wbprivate/Makefile.am 2011-12-10 07:49:14.230858719 +0100 +@@ -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\ +@@ -76,11 +75,7 @@ libwbprivate_a_SOURCES=\ + $(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)/frontend/common/select_option_dialog.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/select_option_dialog.cpp + + #BUILT_SOURCES=stdafx.h.gch + #stdafx.h.gch: workbench/stdafx.h +diff -up mysql-workbench-gpl-5.2.36-src/library/forms/Makefile.am.tinyxml mysql-workbench-gpl-5.2.36-src/library/forms/Makefile.am +--- mysql-workbench-gpl-5.2.36-src/library/forms/Makefile.am.tinyxml 2011-12-02 12:37:01.000000000 +0100 ++++ mysql-workbench-gpl-5.2.36-src/library/forms/Makefile.am 2011-12-10 07:49:59.540022494 +0100 +@@ -74,7 +74,7 @@ gtk/src/lf_menu.cpp\ + gtk/src/lf_menubar.cpp\ + gtk/src/lf_hypertext.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\ +@@ -86,7 +86,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.36-src/modules/wb.mysql.import/Makefile.am.tinyxml mysql-workbench-gpl-5.2.36-src/modules/wb.mysql.import/Makefile.am +--- mysql-workbench-gpl-5.2.36-src/modules/wb.mysql.import/Makefile.am.tinyxml 2011-12-02 12:37:03.000000000 +0100 ++++ mysql-workbench-gpl-5.2.36-src/modules/wb.mysql.import/Makefile.am 2011-12-10 07:44:49.683838383 +0100 +@@ -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 ba472b3..332f236 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.35 -%global tarversion gpl-5.2.35-src -%global srcversion gpl-5.2.35-src +%global mw_version 5.2.36 +%global tarversion gpl-5.2.36-src +%global srcversion gpl-5.2.36-src # Use system cppconn if a compatible upstream version exists #global cppconnver 1.1.0-0.3.bzr895 @@ -27,7 +27,7 @@ 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.34-tinyxml.patch +Patch3: %{name}-5.2.36-tinyxml.patch # redirect man page to /usr/share Patch5: %{name}-5.2.34-man.patch @@ -100,7 +100,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.1 +Version: 1.0.3 Release: 0.%{mw_version}%{?dist} BuildArch: noarch @@ -215,6 +215,7 @@ update-desktop-database &> /dev/null || : %files -n mysql-utilities %defattr(-, root, root, -) %doc ext/mysql-utilities/*.txt +%{_bindir}/mysqldbcompare %{_bindir}/mysqldbcopy %{_bindir}/mysqldbexport %{_bindir}/mysqldbimport @@ -224,6 +225,7 @@ update-desktop-database &> /dev/null || : %{_bindir}/mysqlmetagrep %{_bindir}/mysqlprocgrep %{_bindir}/mysqlreplicate +%{_bindir}/mysqlrplcheck %{_bindir}/mysqlserverclone %{_bindir}/mysqlserverinfo %{_bindir}/mysqluserclone @@ -237,6 +239,11 @@ update-desktop-database &> /dev/null || : %changelog +* Sat Dec 10 2011 Remi Collet 5.2.36-1 +- update to 5.2.36 Community (OSS) Edition (GPL) + http://dev.mysql.com/doc/workbench/en/wb-news-5-2-36.html +- mysql-utilities 1.0.3 + * Fri Sep 23 2011 Remi Collet 5.2.35-1 - update to 5.2.35 Community (OSS) Edition (GPL) http://dev.mysql.com/doc/workbench/en/wb-news-5-2-35.html -- cgit