- up to 5.2.37 but our gcc dies with many internal errors on this

Changed files:
    mysql-workbench-python_libs.patch -> 1.4
    mysql-workbench.spec -> 1.35

diff --git a/mysql-workbench-python_libs.patch b/mysql-workbench-python_libs.patch
index 667fc7bf04945f9fffe855f45a6f25ed244ffcfe..2ae3663c468c3a175f612a46011daa72bc6e8c97 100644 (file)
--- a/mysql-workbench-python_libs.patch
+++ b/mysql-workbench-python_libs.patch
@@ -4,9 +4,9 @@ invocation (e.g. -lpython2.6) instead of the .so file. This fixes the
 case with forced as-needed where the .so gets re-ordered to the front
 during link.
 http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=blob;f=dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch;h=8fb6b71e91b0c5e14bb542e05f2bab1da4dbc60d;hb=6c2a287fc8cd60b3806ec3d5b058a513c4b417b5
---- mysql-workbench-oss-5.2.22/configure.in    2010-04-02 03:26:27.000000000 +0200
-+++ mysql-workbench-oss-5.2.22/configure.in    2010-04-09 16:06:10.271092660 +0200
-@@ -280,12 +280,7 @@
+--- mysql-workbench-gpl-5.2.37-src/configure.in~       2011-12-22 23:37:36.000000000 +0100
++++ mysql-workbench-gpl-5.2.37-src/configure.in        2011-12-29 14:47:02.360222574 +0100
+@@ -245,14 +245,9 @@
  AC_CHECK_PROG(PYTHON27, python2.7, [yes])
  # Python headers
  AC_MSG_CHECKING(for Python libraries)
@@ -15,9 +15,11 @@ http://git.overlays.gentoo.org/gitweb/?p=user/wish.git;a=blob;f=dev-db/mysql-wor
 -cfg=sysconfig.get_config_vars()
 -lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
 -if os.path.exists(lib):
--    print lib")]
+-    print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\")")]
 +PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')]
  PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
  print sysconfig.get_python_inc()")]
  PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
+ if test "$PYTHON_LIBS" = ""; then
+   AC_MSG_RESULT(not found)
 

diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 7a8ef4fdc357ecdb48d680dff16af11451a2d239..030754d8de0d3ecb23b62c22956e19f0011c09ca 100644 (file)
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -1,16 +1,15 @@
 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.34
-Release:       2
+Version:       5.2.37
+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: 781a4e9f6b5573b06a838d53ddb9136d
+# Source0-md5: c7301f078834512538353ee3ce2cf460
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-python_libs.patch
 Patch2:                %{name}-posix.patch
-Patch3:                %{name}-gcc.patch
 URL:           http://wb.mysql.com/
 BuildRequires: OpenGL-devel
 BuildRequires: autoconf
@@ -76,7 +75,6 @@ rm -rf ext/yassl
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__glib_gettextize}