up to 6.3.7

fails to match mysql version

diff --git a/mysql-version.patch b/mysql-version.patch
new file mode 100644 (file)
index 0000000..db42b3c
--- /dev/null
+++ b/mysql-version.patch
@@ -0,0 +1,22 @@
+Allow matching version if it has also Release Component:
+
+CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:148 (message):
+  Could NOT find MySQL: Found unsuitable version "#define
+  MYSQL_SERVER_VERSION         "5.6.28-76.1"", but required is at least "5.6.0"
+  (found /usr/include/mysql)
+Call Stack (most recent call first):
+  /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:386 (_FPHSA_FAILURE_MESSAGE)
+  build/cmake/Modules/FindMySQL.cmake:90 (find_package_handle_standard_args)
+  CMakeLists.txt:108 (find_package)
+
+--- mysql-workbench-community-6.3.7-src/build/cmake/Modules/FindMySQL.cmake~   2016-06-08 15:51:41.000000000 +0300
++++ mysql-workbench-community-6.3.7-src/build/cmake/Modules/FindMySQL.cmake    2016-06-21 16:56:45.939252087 +0300
+@@ -73,7 +73,7 @@
+ 
+         find_file(MySQL_VERSION_FILE mysql_version.h ${MySQL_INCLUDE_DIRS})
+         file(STRINGS "${MySQL_VERSION_FILE}" MySQL_VERSION_LINE REGEX "MYSQL_SERVER_VERSION")
+-        string(REGEX REPLACE "#define MYSQL_SERVER_VERSION[ \t]+\"([0-9.]+)\"" "\\1" MySQL_VERSION "${MySQL_VERSION_LINE}")
++        string(REGEX REPLACE "#define MYSQL_SERVER_VERSION[ \t]+\"([0-9.]+)(-[0-9.])?\"" "\\1" MySQL_VERSION "${MySQL_VERSION_LINE}")
+         
+         # Find the library:
+         set(MySQL_LIBRARY_NAMES mysqlclient mysqlclient_r)

diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 6dc3012f3373df50376bde6957803f714ba6a279..17f67031dff8312877791778fca0b4e41cc6746e 100644 (file)
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -13,13 +13,13 @@
 Summary:       Extensible modeling tool for MySQL
 Summary(pl.UTF-8):     Narzędzie do modelowania baz danych dla MySQL-a
 Name:          mysql-workbench
-Version:       6.3.5
-Release:       2
+Version:       6.3.7
+Release:       0.1
 License:       GPL v2
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/workbench/
 Source0:       http://cdn.mysql.com/Downloads/MySQLGUITools/%{name}-community-%{version}-src.tar.gz
-# Source0-md5: efe4caf5ccd45e2d6d69778f294aa2c0
+# Source0-md5: 385987776b63ad9a1c9389a9da07a6c5
 Source1:       http://www.antlr3.org/download/antlr-3.4-complete.jar
 # Source1-md5: 1b91dea1c7d480b3223f7c8a9aa0e172
 Source2:       PLD_Linux_(MySQL_Package).xml
@@ -28,7 +28,7 @@ Patch1:               log_slow_queries.patch
 Patch2:                bashism.patch
 Patch3:                wrapper-exec.patch
 Patch4:                antlr-res.patch
-Patch5:                mysql-workbench-bug-78668.patch
+Patch5:                mysql-version.patch
 Patch6:                mysql-workbench-json.patch
 URL:           http://wb.mysql.com/
 BuildRequires: OpenGL-devel
@@ -52,7 +52,7 @@ BuildRequires:        libxml2-devel
 BuildRequires: libzip-devel
 BuildRequires: lua51-devel
 BuildRequires: mysql-connector-c++-devel >= 1.1.0-0.bzr916
-BuildRequires: mysql-devel
+BuildRequires: mysql-devel >= 5.6.0
 BuildRequires: pcre-cxx-devel
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig