[mysql-workbench] patch for server startup/shutdown command

[Remi Collet]

commit 6cf59c832949f75e052b5e1188f6c1db7e5132ec
Author: remi <fedora at famillecollet.com>
Date:   Fri Dec 16 18:50:02 2011 +0100

    patch for server startup/shutdown command

 mysql-workbench-5.2.36-profiles.patch |   24 ++++++++++++++++++++++++
 mysql-workbench.spec                  |   22 +++++++++++++++++-----
 2 files changed, 41 insertions(+), 5 deletions(-)
---
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 646452a..e32a79b 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -13,7 +13,7 @@
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
 Version:   %{mw_version}
-Release:   2%{?dist}
+Release:   3%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
 
@@ -33,13 +33,15 @@ 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
 BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: lua-devel >= 5.1
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 12
 BuildRequires: ctemplate-devel
 %endif
 BuildRequires: libgnome-devel >= 2
@@ -127,7 +129,7 @@ and administering MySQL servers.
 rm -rf ext/cppconn
 %endif
 
-%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 12
 %patch2 -p1 -b .ctemplate
 rm -rf ext/ctemplate
 %endif
@@ -139,6 +141,7 @@ rm -rf library/tinyxml
 
 %patch5 -p1 -b .man
 %patch6 -p1 -b .glib
+%patch7 -p1 -b .profiles
 
 
 touch -r COPYING .timestamp4rpm
@@ -158,7 +161,12 @@ touch po/POTFILES.in
 %build
 NOCONFIGURE=yes ./autogen.sh
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive"
-%configure --disable-debug --enable-mysql-utilities
+%configure \
+    --disable-debug \
+%if 0%{?fedora} < 12 && 0%{?rhel} < 7
+    --with-bundled-ctemplate \
+%endif
+    --enable-mysql-utilities
 
 make %{?_smp_mflags}
 
@@ -243,6 +251,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Fri Dec 16 2011 Remi Collet <remi at 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 at fedoraproject.org> 5.2.36-2
 - patch for http://bugs.mysql.com/63705 (only include glib.h)