patch for server startup/shutdown command

3 files changed, 121 insertions, 3 deletions

diff --git a/mysql-workbench-5.2.36-glib.patch b/mysql-workbench-5.2.36-glib.patch
new file mode 100644
index 0000000..0472b29
--- /dev/null
+++ b/mysql-workbench-5.2.36-glib.patch
@@ -0,0 +1,79 @@
+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 <glib/gpattern.h>
++#include <glib.h>
+ 
+ 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 <glib/gthread.h>
++#include <glib.h>
+ #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 <glib/gmessages.h>
++#include <glib.h>
+ 
+ #ifdef _WIN32
+ #include <cairo/cairo-win32.h>
+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 <glib/gbase64.h>
++#include <glib.h>
+ #include <functional>
+ 
+ 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 <glib/gunicode.h>
++#include <glib.h>
+ #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 <glib/gunicode.h>
++#include <glib.h>
+ 
+ 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
new file mode 100644
index 0000000..787b07f
--- /dev/null
+++ b/mysql-workbench-5.2.36-profiles.patch
@@ -0,0 +1,24 @@
+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 @@
+     <value type="string" key="sys.config.path">/etc/my.cnf</value>

+     <value type="string" key="sys.config.section">mysqld</value>

+       

+-    <value type="string" key="sys.mysqld.start">/etc/init.d/mysqld start</value>

+-    <value type="string" key="sys.mysqld.stop">/etc/init.d/mysqld stop</value>

++    <value type="string" key="sys.mysqld.start">/sbin/service mysqld start</value>

++    <value type="string" key="sys.mysqld.stop">/sbin/service mysqld stop</value>

+     <value type="string" key="sys.mysqld.status">ps -C mysqld -o pid=</value>

+     <value type="int" key="sys.usesudo">1</value>

+     <value type="int" key="sys.usesudostatus">0</value>

+     <value type="string" key="sys.sudo">/usr/bin/sudo -p EnterPasswordHere /bin/sh -c</value>

+ 

+-    <value type="string" key="sys.system">Linux</value>
+-    <value type="string" key="serverVersion">5.1</value>

++    <value type="string" key="sys.system">Linux</value>

++    <value type="string" key="serverVersion">5.5</value>

+   </value>

+ </data>

+   

diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 029bcd0..08b53de 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -13,7 +13,8 @@
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
 Version:   %{mw_version}
-Release:   1%{?dist}
+# also check mysq-utilities release
+Release:   3%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
 
@@ -30,7 +31,12 @@ 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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pcre-devel >= 3.9
@@ -101,7 +107,7 @@ 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}
+Release:        0.%{mw_version}%{?dist}.1
 
 BuildArch:      noarch
 BuildRequires:  python-devel >= 2.4
@@ -135,6 +141,8 @@ rm -rf library/tinyxml
 %endif
 
 %patch5 -p1 -b .man
+%patch6 -p1 -b .glib
+%patch7 -p1 -b .profiles
 
 
 touch -r COPYING .timestamp4rpm
@@ -244,6 +252,13 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Fri Dec 16 2011 Remi Collet <remi@fedoraproject.org> 5.2.36-3
+- patch for server startup/shutdown command
+  fixes bug #767391, upstream http://bugs.mysql.com/63777
+
+* Sat Dec 10 2011 Remi Collet <remi@fedoraproject.org> 5.2.36-2
+- patch for http://bugs.mysql.com/63705 (only include glib.h)
+
 * Sat Dec 10 2011 Remi Collet <remi@fedoraproject.org> 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