commit 5e5d256abc772062d4bba8b3ed52c1e1659dd9e6
Author: Elan Ruusamäe <[email protected]>
Date: Tue Jan 1 14:49:23 2013 +0200
- up to 5.2.45
bashism.patch | 40 +++++++++++++++++++++++-----------------
mysql-workbench.spec | 4 ++--
system-cppconn.patch | 17 ++++-------------
3 files changed, 29 insertions(+), 32 deletions(-)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 5b6544e..a62ef4b 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -6,12 +6,12 @@
Summary: Extensible modeling tool for MySQL
Summary(pl.UTF-8): Narzędzie do modelowania baz danych dla MySQL-a
Name: mysql-workbench
-Version: 5.2.44
+Version: 5.2.45
Release: 1
License: GPL v2
Group: Applications/Databases
Source0:
ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-gpl-%{version}-src.tar.gz
-# Source0-md5: ea609fcd5d42333291a8ea6015627583
+# Source0-md5: 9cb676dd11ae54e3b6b9819331050122
Source1: PLD_Linux_(MySQL_Package).xml
Patch0: %{name}-desktop.patch
Patch1: %{name}-python_libs.patch
diff --git a/bashism.patch b/bashism.patch
index 8083e01..4731fb9 100644
--- a/bashism.patch
+++ b/bashism.patch
@@ -6,8 +6,8 @@
# Uncomment the following line if you're having trouble with gnome-keyring
lockups.
# This will cause passwords to be stored only temporarily for the session.
---- mysql-workbench-gpl-5.2.38-src/./modules/wb.utils/wb_utils_grt.py~
2012-02-21 18:53:37.000000000 +0200
-+++ mysql-workbench-gpl-5.2.38-src/./modules/wb.utils/wb_utils_grt.py
2012-05-11 20:37:19.872151306 +0300
+--- mysql-workbench-gpl-5.2.45-src/./modules/wb.utils/wb_utils_grt.py~
2012-12-31 11:43:56.000000000 +0200
++++ mysql-workbench-gpl-5.2.45-src/./modules/wb.utils/wb_utils_grt.py
2012-12-31 11:44:25.938118046 +0200
@@ -114,7 +114,7 @@
subprocess.Popen(command, shell = True)
else:
@@ -17,7 +17,7 @@
# Utilities only work in Py 2.6
-@@ -160,14 +160,14 @@
+@@ -203,14 +203,14 @@
f.write('echo "The following MySQL Utilities are
available:"\n')
f.write('echo $MYSQL_UTILITIES_COMMANDS\n')
f.write('rm -f "%s"\n' % setup_script)
@@ -32,9 +32,9 @@
else:
- subprocess.call(["/bin/bash", "-c", "%s -e %s &" % (term,
setup_script)])
+ subprocess.call(["/bin/sh", "-c", "%s -e %s &" % (term,
setup_script)])
+ else:
+ raise RuntimeError("Terminal program could not be found")
-
- class CheckForUpdateThread(threading.Thread):
---
mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/frontend/wb_admin_grt.py~
2012-09-26 23:50:38.000000000 +0300
+++ mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/frontend/wb_admin_grt.py
2012-10-04 11:57:08.815085883 +0300
@@ -123,9 +123,9 @@
@@ -49,17 +49,23 @@
app = App.get()
try:
----
mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/backend/wb_server_management.py~
2012-09-26 23:50:52.000000000 +0300
-+++
mysql-workbench-gpl-5.2.44-src/./plugins/wb.admin/backend/wb_server_management.py
2012-10-04 11:54:47.998554556 +0300
-@@ -141,9 +141,9 @@
- raise Exception("WBA: Internal error, unexpected character in script
to be executed")
+---
mysql-workbench-gpl-5.2.45-src/./plugins/wb.admin/backend/wb_server_management.py~
2012-12-27 17:42:57.000000000 +0200
++++
mysql-workbench-gpl-5.2.45-src/./plugins/wb.admin/backend/wb_server_management.py
2012-12-31 11:45:11.326796419 +0200
+@@ -69,7 +69,7 @@
+ sudo_user = "sudo -u %s" % as_user
+ sudo_prefix = sudo_prefix.replace('sudo', sudo_user)
- if not as_admin:
-- result = pexpect.run("/bin/bash -c '" + script + "'",
withexitstatus=True)
-+ result = pexpect.run("/bin/sh -c '" + script + "'",
withexitstatus=True)
- else:
-- child = pexpect.spawn("/bin/bash -c '" + script + "'") # script
should already have sudo prefix
-+ child = pexpect.spawn("/bin/sh -c '" + script + "'") # script should
already have sudo prefix
+- if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix:
++ if '/bin/sh' in sudo_prefix or '/bin/sh' in sudo_prefix:
+ command = sudo_prefix + " \"" + command.replace('\\',
'\\\\').replace('"', r'\"').replace('$','\\$') + "\""
+ else:
+ command = sudo_prefix + " /bin/sh -c \"" + command.replace('\\',
'\\\\').replace('"', r'\"').replace('$','\\$') + "\""
+@@ -152,7 +152,7 @@
+
+ # Exec the command
+ waiting_rest_of_password_prompt = False
+- child = pexpect.spawn("/bin/bash", ["-c", script]) # script should
already have sudo prefix
++ child = pexpect.spawn("/bin/sh", ["-c", script]) # script should already
have sudo prefix
+ if as_user != Users.CURRENT:
+ # If sudo is being used, we need to input the password
try:
- child.expect('assword', timeout=10)
- if admin_password is not None:
diff --git a/system-cppconn.patch b/system-cppconn.patch
index d78632d..d5abdef 100644
--- a/system-cppconn.patch
+++ b/system-cppconn.patch
@@ -50,18 +50,9 @@ diff -up
mysql-workbench-gpl-5.2.43-src/ext/Makefile.am.cppconn mysql-workbench-
if BUNDLE_UTILITIES
all-am:
-diff -up
mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am.cppconn
mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am
----
mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am.cppconn
2012-09-11 17:46:58.000000000 +0200
-+++ mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am
2012-09-13 18:09:35.484090509 +0200
-@@ -38,7 +38,6 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
- -I$(top_srcdir)/modules/wb.model/src\
- -I$(top_srcdir)/modules/interfaces\
- -I$(top_srcdir)/ext\
-- -I$(top_srcdir)/ext/cppconn\
- -I$(top_srcdir)/modules\
- -I$(top_srcdir)/ext/vsqlite++/include\
- -I$(top_srcdir)/ext/scintilla/include\
-@@ -54,14 +53,13 @@ mysql_workbench_bin_LDADD=\
+--- mysql-workbench-gpl-5.2.45-src/frontend/linux/workbench/Makefile.am~
2012-12-31 11:46:37.000000000 +0200
++++ mysql-workbench-gpl-5.2.45-src/frontend/linux/workbench/Makefile.am
2012-12-31 11:47:02.801997914 +0200
+@@ -53,14 +53,13 @@
$(top_srcdir)/library/base/libwbbase.la\
$(top_srcdir)/library/grt/src/libgrt.la\
$(top_srcdir)/library/dbc/libcdbc.la\
@@ -69,7 +60,7 @@ diff -up
mysql-workbench-gpl-5.2.43-src/frontend/linux/workbench/Makefile.am.cpp
$(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la\
$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
$(top_srcdir)/library/canvas/src/libmdcanvas.la\
- $(top_srcdir)/library/mysql55-parser/libmysql55parser.la\
+ $(top_srcdir)/library/mysql-parser/libmysqlparser.la\
@CTEMPLATE_LIBS@\
@GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@
@MYSQL_LIBS@ @SQLITE3_LIBS@\
- -lX11
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/5e5d256abc772062d4bba8b3ed52c1e1659dd9e6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
