Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2021-03-30 20:52:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench"
Tue Mar 30 20:52:01 2021 rev:53 rq:866476 version:8.0.23
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2020-07-03 00:03:00.118197098 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-workbench.new.2401/mysql-workbench.changes
2021-03-30 20:52:04.316161530 +0200
@@ -1,0 +2,26 @@
+Sat Jan 23 13:29:31 UTC 2021 - Mykola Krachkovsky <[email protected]>
+
+- Updated to 8.0.23
+ * release notes:
+
https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-23.html#workbench-8-0-23-feature
+- Changed python to 3.7+
+- Fixed upstream
+ * removed mysql-workbench-placeholders.patch
+
+-------------------------------------------------------------------
+Sat Jan 2 11:31:52 UTC 2021 - Mykola Krachkovsky <[email protected]>
+
+- Updated to 8.0.22
+ * release notes (no notes for 8.0.20)
+ https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-21.html
+ https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-22.html
+- Moved build to other directory (conflict with existing cmake,
+ but existing build directory has modules)
+- Updated patch due to code changes
+ * updated mysql-workbench-mariadb.patch
+- Fixed boost placeholders namespace
+ * added mysql-workbench-placeholders.patch
+- Fixed change in libshh version header
+ * added mysql-workbench-ssh.patch
+
+-------------------------------------------------------------------
Old:
----
mysql-workbench-community-8.0.19-src.tar.gz
New:
----
mysql-workbench-community-8.0.23-src.tar.gz
mysql-workbench-ssh.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-workbench.spec ++++++
--- /var/tmp/diff_new_pack.6nzRPB/_old 2021-03-30 20:52:05.080162387 +0200
+++ /var/tmp/diff_new_pack.6nzRPB/_new 2021-03-30 20:52:05.084162391 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define edition community
Name: mysql-workbench
-Version: 8.0.19
+Version: 8.0.23
Release: 0
Summary: A MySQL visual database modeling, administration and querying
tool
License: GPL-2.0-only AND GPL-2.0-or-later
@@ -54,6 +54,8 @@
Patch23: mysql-workbench-antlr4.patch
# PATCH-FIX-OPENSUSE drop unused glXQueryVersion call
Patch24: mysql-workbench-unused-glx-call.patch
+# PATCH-FIX-UPSTREAM change libssh header to find version
+Patch26: mysql-workbench-ssh.patch
BuildRequires: Mesa-devel
BuildRequires: ant
BuildRequires: antlr4-tool
@@ -74,7 +76,6 @@
BuildRequires: libtool
BuildRequires: ninja
BuildRequires: pkgconfig
-BuildRequires: python-devel
BuildRequires: rapidjson-devel
BuildRequires: swig
BuildRequires: tinyxml-devel
@@ -94,7 +95,7 @@
BuildRequires: pkgconfig(libzip)
BuildRequires: pkgconfig(lua)
BuildRequires: pkgconfig(proj)
-BuildRequires: pkgconfig(python)
+BuildRequires: pkgconfig(python3) >= 3.7
BuildRequires: pkgconfig(sigc++-2.0)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(uuid)
@@ -140,6 +141,7 @@
%build
export CFLAGS="%{optflags}"
%define __builder ninja
+%define __builddir obs-build
# build will fail if -Werror is used on recent complires
sed -i "s|-Werror||g" CMakeLists.txt
# fix building on Leap
++++++ mysql-workbench-community-8.0.19-src.tar.gz ->
mysql-workbench-community-8.0.23-src.tar.gz ++++++
/work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-8.0.19-src.tar.gz
/work/SRC/openSUSE:Factory/.mysql-workbench.new.2401/mysql-workbench-community-8.0.23-src.tar.gz
differ: char 5, line 1
++++++ mysql-workbench-mariadb.patch ++++++
--- /var/tmp/diff_new_pack.6nzRPB/_old 2021-03-30 20:52:05.148162464 +0200
+++ /var/tmp/diff_new_pack.6nzRPB/_new 2021-03-30 20:52:05.148162464 +0200
@@ -63,10 +63,20 @@
case MYSQL_TYPE_TYPED_ARRAY: /* Used only for replication. */
#endif
// TODO: implement handling
-@@ -2270,6 +2270,8 @@
+@@ -2290,7 +2290,7 @@
*(*_row_buffer)[col_index].length);
_bulk_insert_record.append("')");
break;
+-#if MYSQL_VERSION_ID > 80021
++#if MYSQL_VERSION_ID > 80021 && !defined(MARIADB_BASE_VERSION)
+ case MYSQL_TYPE_INVALID:
+ // TODO: added to fix the build. Need to check how to handle this.
+ break;
+@@ -2298,7 +2298,8 @@
+ // TODO: added to fix the build. Need to check how to handle this. In
the current version this is just a placeholder.
+ break;
+ #endif
+-
+ case MAX_NO_FIELD_TYPES:
+ break;
}
++++++ mysql-workbench-ssh.patch ++++++
diff --color -uNr
mysql-workbench-community-8.0.22-pre/build/cmake/Modules/FindLibSSH.cmake
mysql-workbench-community-8.0.22-new/build/cmake/Modules/FindLibSSH.cmake
--- mysql-workbench-community-8.0.22-pre/build/cmake/Modules/FindLibSSH.cmake
2020-09-27 06:46:24.000000000 +0300
+++ mysql-workbench-community-8.0.22-new/build/cmake/Modules/FindLibSSH.cmake
2020-12-09 15:23:54.879223277 +0200
@@ -53,6 +53,10 @@
set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh.h)
file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define
LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+if (NOT LibSSH_VERSION_LINE_MAJOR)
+ set(LibSSH_HEADER_FILE ${LibSSH_INCLUDE_DIR}/libssh/libssh_version.h)
+ file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MAJOR REGEX "#define
LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+endif()
if (LibSSH_VERSION_LINE_MAJOR)
file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MINOR REGEX "#define
LIBSSH_VERSION_MINOR[ ]+[0-9]+")
file(STRINGS ${LibSSH_HEADER_FILE} LibSSH_VERSION_LINE_MICRO REGEX "#define
LIBSSH_VERSION_MICRO[ ]+[0-9]+")
