From 7c7a913244e2bbeaab9b4cf881390bf3fe866f37 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 May 2012 20:45:08 +0200 Subject: mysql-workbench 5.2.40 --- mysql-workbench-5.2.36-glib.patch | 79 ----------------------------------- mysql-workbench-5.2.36-profiles.patch | 24 ----------- mysql-workbench.spec | 12 +++--- 3 files changed, 5 insertions(+), 110 deletions(-) delete mode 100644 mysql-workbench-5.2.36-glib.patch delete mode 100644 mysql-workbench-5.2.36-profiles.patch diff --git a/mysql-workbench-5.2.36-glib.patch b/mysql-workbench-5.2.36-glib.patch deleted file mode 100644 index 0472b29..0000000 --- a/mysql-workbench-5.2.36-glib.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up mysql-workbench-gpl-5.2.36-src/backend/wbprivate/sqlide/wb_live_schema_tree.h.glib mysql-workbench-gpl-5.2.36-src/backend/wbprivate/sqlide/wb_live_schema_tree.h ---- mysql-workbench-gpl-5.2.36-src/backend/wbprivate/sqlide/wb_live_schema_tree.h.glib 2011-12-10 10:18:15.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/backend/wbprivate/sqlide/wb_live_schema_tree.h 2011-12-10 10:18:32.000000000 +0100 -@@ -24,7 +24,7 @@ - #include "grtpp.h" - #include "workbench/wb_backend_public_interface.h" - #include "base/string_utilities.h" --#include -+#include - - namespace wb - { -diff -up mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h.glib mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h ---- mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h.glib 2011-12-10 09:45:33.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view.h 2011-12-10 09:45:40.000000000 +0100 -@@ -28,7 +28,7 @@ - #include "mdc_selection.h" - - #ifndef _WIN32 --#include -+#include - #endif - - BEGIN_MDC_DECLS -diff -up mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view_printing.cpp.glib mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view_printing.cpp ---- mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view_printing.cpp.glib 2011-12-10 09:46:27.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/library/canvas/src/mdc_canvas_view_printing.cpp 2011-12-10 09:46:36.000000000 +0100 -@@ -21,7 +21,7 @@ - - #include "mdc_canvas_view.h" - #include "mdc_canvas_view_printing.h" --#include -+#include - - #ifdef _WIN32 - #include -diff -up mysql-workbench-gpl-5.2.36-src/library/grt/src/grtpp_util.cpp.glib mysql-workbench-gpl-5.2.36-src/library/grt/src/grtpp_util.cpp ---- mysql-workbench-gpl-5.2.36-src/library/grt/src/grtpp_util.cpp.glib 2011-12-10 09:48:51.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/library/grt/src/grtpp_util.cpp 2011-12-10 09:49:00.000000000 +0100 -@@ -25,7 +25,7 @@ - #include "grtpp_util.h" - #include "base/string_utilities.h" - --#include -+#include - #include - - using namespace grt; -diff -up mysql-workbench-gpl-5.2.36-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp.glib mysql-workbench-gpl-5.2.36-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp ---- mysql-workbench-gpl-5.2.36-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp.glib 2011-12-10 10:28:39.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/modules/db.mysql.sqlparser/src/mysql_sql_parser_fe.cpp 2011-12-10 10:29:11.000000000 +0100 -@@ -20,7 +20,7 @@ - - #include "stdafx.h" - --#include -+#include - #include "grt/common.h" - #include "grt/grt_manager.h" - #include "grtdb/charset_utils.h" -@@ -651,4 +651,4 @@ std::string Mysql_sql_parser_fe::get_fir - return versioning_comment_subst_token; - else - return token; --} -\ No newline at end of file -+} -diff -up mysql-workbench-gpl-5.2.36-src/plugins/db.mysql/backend/db_plugin_be.cpp.glib mysql-workbench-gpl-5.2.36-src/plugins/db.mysql/backend/db_plugin_be.cpp ---- mysql-workbench-gpl-5.2.36-src/plugins/db.mysql/backend/db_plugin_be.cpp.glib 2011-12-10 10:38:08.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/plugins/db.mysql/backend/db_plugin_be.cpp 2011-12-10 10:38:22.000000000 +0100 -@@ -31,7 +31,7 @@ - #include "grts/structs.db.h" - #include "base/string_utilities.h" - --#include -+#include - - void Db_plugin::grtm(bec::GRTManager *grtm) - { diff --git a/mysql-workbench-5.2.36-profiles.patch b/mysql-workbench-5.2.36-profiles.patch deleted file mode 100644 index 787b07f..0000000 --- a/mysql-workbench-5.2.36-profiles.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up mysql-workbench-gpl-5.2.36-src/res/mysql.profiles/Fedora_Linux_(MySQL_Package).xml.orig mysql-workbench-gpl-5.2.36-src/res/mysql.profiles/Fedora_Linux_(MySQL_Package).xml -diff -up mysql-workbench-gpl-5.2.36-src/res/mysql.profiles/Fedora_Linux_(Vendor_Package).xml.orig mysql-workbench-gpl-5.2.36-src/res/mysql.profiles/Fedora_Linux_(Vendor_Package).xml ---- mysql-workbench-gpl-5.2.36-src/res/mysql.profiles/Fedora_Linux_(Vendor_Package).xml.orig 2011-12-16 17:35:19.669703414 +0100 -+++ mysql-workbench-gpl-5.2.36-src/res/mysql.profiles/Fedora_Linux_(Vendor_Package).xml 2011-12-16 17:38:25.583707861 +0100 -@@ -5,15 +5,15 @@ - /etc/my.cnf - mysqld - -- /etc/init.d/mysqld start -- /etc/init.d/mysqld stop -+ /sbin/service mysqld start -+ /sbin/service mysqld stop - ps -C mysqld -o pid= - 1 - 0 - /usr/bin/sudo -p EnterPasswordHere /bin/sh -c - -- Linux -- 5.1 -+ Linux -+ 5.5 - - - diff --git a/mysql-workbench.spec b/mysql-workbench.spec index 8ea2450..f5782b5 100644 --- a/mysql-workbench.spec +++ b/mysql-workbench.spec @@ -1,6 +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.39 +%global mw_version 5.2.40 %global mw_release 1 %global tarversion gpl-%{mw_version}-src %global srcversion gpl-%{mw_version}-src @@ -29,10 +29,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 -# http://bugs.mysql.com/63705 - Only 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 @@ -124,8 +120,6 @@ rm -rf ext/ctemplate rm -rf library/tinyxml %endif -%patch6 -p1 -b .glib -%patch7 -p1 -b .profiles %patch8 -p1 -b .automake @@ -210,6 +204,10 @@ fi %changelog +* Tue May 15 2012 Remi Collet 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 + * Sun Apr 15 2012 Remi Collet 5.2.39-1 - update to 5.2.39 Community (OSS) Edition (GPL) http://dev.mysql.com/doc/workbench/en/wb-news-5-2-39.html -- cgit