commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2020-07-03 00:01:46
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new.3060 (New)
Package is "mysql-workbench"
Fri Jul 3 00:01:46 2020 rev:52 rq:799501 version:8.0.19
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2019-06-12 13:07:57.821141601 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-workbench.new.3060/mysql-workbench.changes
2020-07-03 00:03:00.118197098 +0200
@@ -1,0 +2,38 @@
+Fri May 1 08:31:21 UTC 2020 - Mykola Krachkovsky
+
+- Updated to 8.0.19
+ * release notes
+https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-19.html
+https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-18.html
+https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-17.html
+https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-16.html
+- Dropped deprecated dependencies for python-paramiko, python-pexpect
+- Updated patch due to code changes
+ * updated mysql-workbench-hidpi.patch
+ * updated mysql-workbench-unbundle-libscintilla.patch
+ * updated mysql-workbench-warnings-fix.patch
+- Dropped prebuilt parsers as we now have antlr4 (new dependency),
+ and fixed call for our jar's
+ * removed mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz
+ * removed mysql-workbench-prebuilt-parsers.patch
+ * added mysql-workbench-antlr4.patch
+- Merged and updated 2 MariaDB patches into one
+ * updated mysql-workbench-mariadb.patch
+ * removed mysql-workbench-mariadb-8.0.15.patch
+- Fixed dependecies for pcrecpp & zip
+ * added mysql-workbench-dependences.patch
+- Fixed unused call which leads to linking error
+ * added mysql-workbench-unused-glx-call.patch
+- Added dependency for rapidjson, jsonparser not included anymore
+ * removed git_patch_105207009.patch
+- Dropped unneeded preloading
+ * removed mysql-workbench-preload-sqlparser.patch
+
+---
+Mon Mar 18 22:11:51 UTC 2019 - Mykola Krachkovsky
+
+- fixed not found ldconfig if it's not in $PATH
+ (thanks Tyler Palmer for pointing out)
+ * added mysql-workbench-proj-ldconfig.patch
+
+---
Old:
git_patch_105207009.patch
mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz
mysql-workbench-community-8.0.15-src.tar.gz
mysql-workbench-mariadb-8.0.15.patch
mysql-workbench-prebuilt-parsers.patch
mysql-workbench-preload-sqlparser.patch
New:
mysql-workbench-antlr4.patch
mysql-workbench-community-8.0.19-src.tar.gz
mysql-workbench-dependences.patch
mysql-workbench-proj-ldconfig.patch
mysql-workbench-unused-glx-call.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.BdTrDq/_old 2020-07-03 00:03:06.730218990 +0200
+++ /var/tmp/diff_new_pack.BdTrDq/_new 2020-07-03 00:03:06.734219003 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,14 @@
%define edition community
Name: mysql-workbench
-Version:8.0.15
+Version:8.0.19
Release:0
Summary:A MySQL visual database modeling, administration and querying
tool
License:GPL-2.0-only AND GPL-2.0-or-later
Group: Productivity/Databases/Clients
-Url:http://wb.mysql.com
+URL:http://wb.mysql.com
Source:
http://dev.mysql.com/get/Downloads/MySQLGUITools/%{name}-%{edition}-%{version}-src.tar.gz
Source1:openSUSE_Vendor_Package.xml
-Source2:%{name}-%{edition}-%{version}-prebuilt_parsers.tar.gz
Source99: %{name}.rpmlintrc
#Patches
Patch0: patch-desktop-categories.patch
@@ -34,28 +33,30 @@
Patch1: mysql-workbench-no-check-for-updates.patch
# disabled , system scintila is buil with gtk3
Patch7: mysql-workbench-unbundle-libscintilla.patch
-Patch8: mysql-workbench-preload-sqlparser.patch
-# patch from https://bugs.mysql.com/bug.php?id=84886
-Patch11:git_patch_105207009.patch
+# PATCH-FIX-OPENSUSE fix lacking dependency
+Patch9: mysql-workbench-dependences.patch
Patch13:mysql-workbench-mariadb.patch
# PATCH-FIX-UPSTREAM guilla...@opensuse.org
Patch14:fix_aarch64_build.patch
# PATCH-FIX-OPENSUSE allow to both support keyring and start without it
Patch15:
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2019-06-12 13:07:44
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new.4811 (New)
Package is "mysql-workbench"
Wed Jun 12 13:07:44 2019 rev:51 rq:685946 version:8.0.15
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2018-05-01 23:45:51.676006279 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-workbench.new.4811/mysql-workbench.changes
2019-06-12 13:07:57.821141601 +0200
@@ -1,0 +2,38 @@
+Sat Feb 23 10:12:28 UTC 2019 - Mykola Krachkovsky
+
+- fixed HiDPI: about box now works on HiDPI and got sharper images
+ * added mysql-workbench-hidpi.patch
+- fixed License.txt location (Help -> Show License Info)
+ * added mysql-workbench-license-location.patch
+
+---
+Sun Feb 17 08:27:27 UTC 2019 - Mykola Krachkovsky
+
+- Updated to 8.0.15
+ * release notes:
+https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0.html
+ * prebuilt parsers regenerated
+mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz
+- fixed upstream
+ * removed mysql-workbench-cmake-3.2.patch
+ * removed mysql-workbench-gcc6.patch
+ * removed mysql-workbench-gdal-use-CPLFree.patch
+- system libraries update, no need for relaxing requirement anymore
+ * removed mysql-workbench-mysql-version.patch
+- MariaDB now supports JSON
+ * removed mysql-workbench-no-json.patch
+- MariaDB compatablity
+ * removed mariadb-no-escape-string-quote.patch, superseded by
+ * added mysql-workbench-mariadb-8.0.15.patch
+- fixed mysql-connector-cpp includes location
+ * added mysql-workbench-old-api.patch
+- fixed warning interpreted as errors
+ * added mysql-workbench-warnings-fix.patch
+- disabled generating of parser files
+ (which needs complete antlr4 which needs maven in openSUSE)
+ * added mysql-workbench-prebuilt-parsers.patch
+- fixed program start in case of keyring absence without
+ full keyring disabling
+ * added mysql-workbench-keyring-check.patch
+
+---
Old:
mariadb-no-escape-string-quote.patch
mysql-workbench-cmake-3.2.patch
mysql-workbench-community-6.3.10-prebuilt_parsers.tar.gz
mysql-workbench-community-6.3.10-src.tar.gz
mysql-workbench-gcc6.patch
mysql-workbench-gdal-use-CPLFree.patch
mysql-workbench-mysql-version.patch
mysql-workbench-no-json.patch
New:
mysql-workbench-community-8.0.15-prebuilt_parsers.tar.gz
mysql-workbench-community-8.0.15-src.tar.gz
mysql-workbench-hidpi.patch
mysql-workbench-keyring-check.patch
mysql-workbench-license-location.patch
mysql-workbench-mariadb-8.0.15.patch
mysql-workbench-old-api.patch
mysql-workbench-prebuilt-parsers.patch
mysql-workbench-warnings-fix.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.KgHHYt/_old 2019-06-12 13:07:58.917141140 +0200
+++ /var/tmp/diff_new_pack.KgHHYt/_new 2019-06-12 13:07:58.933141133 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define edition community
Name: mysql-workbench
-Version:6.3.10
+Version:8.0.15
Release:0
Summary:A MySQL visual database modeling, administration and querying
tool
License:GPL-2.0-only AND GPL-2.0-or-later
@@ -32,24 +32,28 @@
Patch0: patch-desktop-categories.patch
# Remove check for update in help
Patch1: mysql-workbench-no-check-for-updates.patch
-# PATCH-FIX-UPSTREAM sfal...@opensuse.org
-Patch3: mysql-workbench-cmake-3.2.patch
-# remove json
-Patch5: %{name}-no-json.patch
-Patch6: %{name}-mysql-version.patch
# disabled , system scintila is buil with gtk3
Patch7: mysql-workbench-unbundle-libscintilla.patch
Patch8: mysql-workbench-preload-sqlparser.patch
-# PATCH-FIX-UPSTREAM https://bugs.mysql.com/bug.php?id=83372
-Patch9: mysql-workbench-gcc6.patch
-Patch10:mariadb-no-escape-string-quote.patch
# patch from https://bugs.mysql.com/bug.php?id=84886
Patch11:
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2018-05-01 23:45:46
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Tue May 1 23:45:46 2018 rev:50 rq:602841 version:6.3.10
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2018-02-06 16:49:18.163651248 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2018-05-01 23:45:51.676006279 +0200
@@ -1,0 +2,7 @@
+Mon Apr 30 11:57:26 UTC 2018 - guillaume.gar...@opensuse.org
+
+- Remove abiflags (-m32/64) option for non x86_64 archs
+- Add a patch to fix AArch64:
+ * fix_aarch64_build.patch
+
+---
New:
fix_aarch64_build.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.Ox50Sa/_old 2018-05-01 23:45:52.859963200 +0200
+++ /var/tmp/diff_new_pack.Ox50Sa/_new 2018-05-01 23:45:52.859963200 +0200
@@ -21,7 +21,7 @@
Version:6.3.10
Release:0
Summary:A MySQL visual database modeling, administration and querying
tool
-License:GPL-2.0 AND GPL-2.0+
+License:GPL-2.0-only AND GPL-2.0-or-later
Group: Productivity/Databases/Clients
Url:http://wb.mysql.com
Source:
http://dev.mysql.com/get/Downloads/MySQLGUITools/%{name}-%{edition}-%{version}-src.tar.gz
@@ -48,6 +48,8 @@
# Patch from
https://git.archlinux.org/svntogit/community.git/tree/trunk/0005-gdal-use-CPLFree.patch?h=packages/mysql-workbench
Patch12:mysql-workbench-gdal-use-CPLFree.patch
Patch13:mysql-workbench-mariadb.patch
+# PATCH-FIX-UPSTREAM guilla...@opensuse.org
+Patch14:fix_aarch64_build.patch
BuildRequires: Mesa-devel
BuildRequires: ant
BuildRequires: binutils-gold
@@ -142,12 +144,16 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
%build
export CFLAGS="%{optflags}"
pushd ext/antlr-runtime
autoreconf -fiv
%configure \
+%ifnarch x86_64
+ --enable-abiflags=no \
+%endif
--enable-64bit
make %{?_smp_mflags}
popd
++ fix_aarch64_build.patch ++
---
mysql-workbench-community-6.3.10-src.orig/library/sql.parser/source/ctype-utf8.cpp
2018-04-30 13:12:07.538390814 +0200
+++
mysql-workbench-community-6.3.10-src/library/sql.parser/source/ctype-utf8.cpp
2018-04-30 13:12:59.268602104 +0200
@@ -3869,7 +3869,7 @@ static uint16 uni_FF20_FF5F[64]=
static int hexlo(int x)
{
- static char hex_lo_digit[256]=
+ static signed char hex_lo_digit[256]=
{
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* */
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* */
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2018-02-06 16:49:16
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Tue Feb 6 16:49:16 2018 rev:49 rq:573120 version:6.3.10
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2017-12-12 21:25:08.020159376 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2018-02-06 16:49:18.163651248 +0100
@@ -1,0 +2,8 @@
+Mon Feb 5 14:14:51 UTC 2018 - w01dn...@gmail.com
+
+- add mysql-workbench-mariadb.patch
+ to fix compatibility with MariaDB,
+ removed not supported options,
+ added HAVE_CHARSET_... not used mariadb connector
+
+---
New:
mysql-workbench-mariadb.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.zikma7/_old 2018-02-06 16:49:19.251600341 +0100
+++ /var/tmp/diff_new_pack.zikma7/_new 2018-02-06 16:49:19.255600154 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,7 +46,8 @@
# patch from https://bugs.mysql.com/bug.php?id=84886
Patch11:git_patch_105207009.patch
# Patch from
https://git.archlinux.org/svntogit/community.git/tree/trunk/0005-gdal-use-CPLFree.patch?h=packages/mysql-workbench
-Patch1700: mysql-workbench-gdal-use-CPLFree.patch
+Patch12:mysql-workbench-gdal-use-CPLFree.patch
+Patch13:mysql-workbench-mariadb.patch
BuildRequires: Mesa-devel
BuildRequires: ant
BuildRequires: binutils-gold
@@ -139,7 +140,8 @@
#patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch1700 -p1
+%patch12 -p1
+%patch13 -p1
%build
export CFLAGS="%{optflags}"
++ mysql-workbench-mariadb.patch ++
diff -uNr
mysql-workbench-community-6.3.10-src.org/library/cdbc/src/driver_manager.cpp
mysql-workbench-community-6.3.10-src/library/cdbc/src/driver_manager.cpp
---
mysql-workbench-community-6.3.10-src.org/library/cdbc/src/driver_manager.cpp
2017-11-09 18:11:42.0 +0200
+++ mysql-workbench-community-6.3.10-src/library/cdbc/src/driver_manager.cpp
2018-02-05 11:51:59.083657042 +0200
@@ -297,7 +297,7 @@
if (properties.find("OPT_READ_TIMEOUT") == properties.end())
properties["OPT_READ_TIMEOUT"] = read_timeout;
}
-properties["OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true;
+//properties["OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true;
properties["CLIENT_MULTI_STATEMENTS"] = true;
properties["metadataUseInfoSchema"] =
false; // I_S is way too slow for many things as of MySQL 5.6.10, so
disable it for now
@@ -324,7 +324,7 @@
properties.erase("sslCipher");
}
-ssize_t sslModeWb = parameter_values.get_int("useSSL", 0);
+/*ssize_t sslModeWb = parameter_values.get_int("useSSL", 0);
sql::ssl_mode sslMode = sql::SSL_MODE_DISABLED;
switch(sslModeWb)
{
@@ -344,7 +344,7 @@
sslMode = sql::SSL_MODE_VERIFY_IDENTITY;
break;
}
-properties["OPT_SSL_MODE"] = sslMode;
+properties["OPT_SSL_MODE"] = sslMode;*/
// If we are on a pipe connection then set the host name explicitly.
// However, pipe connections can only be established on the local box (Win
only).
diff -uNr
mysql-workbench-community-6.3.10-src.org/library/sql.parser/source/my_config.h
mysql-workbench-community-6.3.10-src/library/sql.parser/source/my_config.h
---
mysql-workbench-community-6.3.10-src.org/library/sql.parser/source/my_config.h
1970-01-01 03:00:00.0 +0300
+++ mysql-workbench-community-6.3.10-src/library/sql.parser/source/my_config.h
2018-02-05 14:09:01.328469741 +0200
@@ -0,0 +1,44 @@
+// include everything from system my_config.h
+#include_next
+
+// add charsets for workbench
+#define HAVE_CHARSET_armscii8 1
+#define HAVE_CHARSET_ascii 1
+#define HAVE_CHARSET_big5 1
+#define HAVE_CHARSET_cp1250 1
+#define HAVE_CHARSET_cp1251 1
+#define HAVE_CHARSET_cp1256 1
+#define HAVE_CHARSET_cp1257 1
+#define HAVE_CHARSET_cp850 1
+#define HAVE_CHARSET_cp852 1
+#define HAVE_CHARSET_cp866 1
+#define HAVE_CHARSET_cp932 1
+#define HAVE_CHARSET_dec8 1
+#define HAVE_CHARSET_eucjpms 1
+#define HAVE_CHARSET_euckr 1
+#define HAVE_CHARSET_gb2312 1
+#define HAVE_CHARSET_gbk 1
+#define HAVE_CHARSET_geostd8 1
+#define HAVE_CHARSET_greek 1
+#define HAVE_CHARSET_hebrew 1
+#define
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2017-12-12 21:24:13
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Tue Dec 12 21:24:13 2017 rev:48 rq:556539 version:6.3.10
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2017-10-23 16:43:29.288213573 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2017-12-12 21:25:08.020159376 +0100
@@ -1,0 +2,13 @@
+Tue Dec 12 15:28:50 UTC 2017 - w01dn...@gmail.com
+
+- Update to version 6.3.10
+ * https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-10.html
+- Fixed patch for current version (git_patch_105207009.patch)
+
+---
+Mon Dec 11 10:56:08 UTC 2017 - mplus...@suse.com
+
+- Drop no longer needed mysql-workbench-mysql_options4.patch
+
+
+---
Old:
mysql-workbench-community-6.3.9-prebuilt_parsers.tar.gz
mysql-workbench-community-6.3.9-src.tar.gz
mysql-workbench-mysql_options4.patch
New:
mysql-workbench-community-6.3.10-prebuilt_parsers.tar.gz
mysql-workbench-community-6.3.10-src.tar.gz
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.hRGRKl/_old 2017-12-12 21:25:08.984112842 +0100
+++ /var/tmp/diff_new_pack.hRGRKl/_new 2017-12-12 21:25:08.984112842 +0100
@@ -18,7 +18,7 @@
%define edition community
Name: mysql-workbench
-Version:6.3.9
+Version:6.3.10
Release:0
Summary:A MySQL visual database modeling, administration and querying
tool
License:GPL-2.0 AND GPL-2.0+
@@ -32,11 +32,6 @@
Patch0: patch-desktop-categories.patch
# Remove check for update in help
Patch1: mysql-workbench-no-check-for-updates.patch
-# Fix build error
-# copytable.cpp:1638: undefined reference to `mysql_options4'
-# This only exist in mysql 5.6.x but the if code didn't work
-# So disable it
-Patch2: mysql-workbench-mysql_options4.patch
# PATCH-FIX-UPSTREAM sfal...@opensuse.org
Patch3: mysql-workbench-cmake-3.2.patch
# remove json
@@ -136,7 +131,6 @@
%setup -q -D -T -b 2 -n %{name}-%{edition}-%{version}-src
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch5 -p1
%patch6 -p1
++ git_patch_105207009.patch ++
--- /var/tmp/diff_new_pack.hRGRKl/_old 2017-12-12 21:25:09.016111297 +0100
+++ /var/tmp/diff_new_pack.hRGRKl/_new 2017-12-12 21:25:09.02004 +0100
@@ -104,9 +104,9 @@
switch (storedValue.getType()) {
case VDouble:
@@ -1334,6 +1342,7 @@ void JsonGridView::setCellValue(mforms::TreeNodeRef
node, int column, const std:
- storedValue = number;
node->set_float(column, number);
_dataChanged(false);
+ break;
+#ifdef DEFINE_UINT64_T_FUNCTIONS
case VInt64:
if (!base::is_number(value))
++ mysql-workbench-community-6.3.9-prebuilt_parsers.tar.gz ->
mysql-workbench-community-6.3.10-prebuilt_parsers.tar.gz ++
++ mysql-workbench-community-6.3.9-src.tar.gz ->
mysql-workbench-community-6.3.10-src.tar.gz ++
/work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-6.3.9-src.tar.gz
/work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-community-6.3.10-src.tar.gz
differ: char 5, line 1
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2017-10-23 16:43:28
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Mon Oct 23 16:43:28 2017 rev:47 rq:534154 version:6.3.9
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2017-06-12 15:28:41.336032554 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2017-10-23 16:43:29.288213573 +0200
@@ -1,0 +2,10 @@
+Mon Oct 16 08:38:48 UTC 2017 - mplus...@suse.com
+
+- Update license information
+
+---
+Wed Oct 11 16:28:23 CEST 2017 - sbra...@suse.com
+
+- Drop obsolete mime-info (boo#1062631).
+
+---
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.1kvY4l/_old 2017-10-23 16:43:30.452159100 +0200
+++ /var/tmp/diff_new_pack.1kvY4l/_new 2017-10-23 16:43:30.456158914 +0200
@@ -21,7 +21,7 @@
Version:6.3.9
Release:0
Summary:A MySQL visual database modeling, administration and querying
tool
-License:GPL-2.0+
+License:GPL-2.0 AND GPL-2.0+
Group: Productivity/Databases/Clients
Url:http://wb.mysql.com
Source:
http://dev.mysql.com/get/Downloads/MySQLGUITools/%{name}-%{edition}-%{version}-src.tar.gz
@@ -182,6 +182,8 @@
echo "%{_libdir}/%{name}" >
%{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
chmod 644 %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+rm -r %{buildroot}%{_datadir}/mime-info
+
# Check for duplicate files
%fdupes -s %{buildroot}
@@ -215,8 +217,6 @@
%dir %{_datadir}/%{name}
%{_datadir}/icons/hicolor/*/mimetypes/*
%{_datadir}/icons/hicolor/*/apps/*
-%dir %{_datadir}/mime-info
-%{_datadir}/mime-info/*
%{_datadir}/mime/packages/*
%{_datadir}/applications/*.desktop
%{_datadir}/%{name}/*
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2017-06-12 15:28:37
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Mon Jun 12 15:28:37 2017 rev:46 rq:500162 version:6.3.9
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2017-02-03 17:50:59.787919961 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2017-06-12 15:28:41.336032554 +0200
@@ -1,0 +2,13 @@
+Wed May 31 08:41:30 UTC 2017 - mplus...@suse.com
+
+- Update to version 6.3.9:
+ * https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-8.html
+ * https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-9.html
+ * resolves CVE-2017-3469 (boo#1035195)
+- Add patches:
+ * mariadb-no-escape-string-quote.patch
+ * git_patch_105207009.patch
+ * mysql-workbench-gdal-use-CPLFree.patch
+- Stop building on 32-bit architectures
+
+---
Old:
mysql-workbench-community-6.3.7-src.tar.gz
New:
git_patch_105207009.patch
mariadb-no-escape-string-quote.patch
mysql-workbench-community-6.3.9-prebuilt_parsers.tar.gz
mysql-workbench-community-6.3.9-src.tar.gz
mysql-workbench-gdal-use-CPLFree.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.WVM5IQ/_old 2017-06-12 15:28:42.927808064 +0200
+++ /var/tmp/diff_new_pack.WVM5IQ/_new 2017-06-12 15:28:42.927808064 +0200
@@ -18,7 +18,7 @@
%define edition community
Name: mysql-workbench
-Version:6.3.7
+Version:6.3.9
Release:0
Summary:A MySQL visual database modeling, administration and querying
tool
License:GPL-2.0+
@@ -26,6 +26,7 @@
Url:http://wb.mysql.com
Source:
http://dev.mysql.com/get/Downloads/MySQLGUITools/%{name}-%{edition}-%{version}-src.tar.gz
Source1:openSUSE_Vendor_Package.xml
+Source2:%{name}-%{edition}-%{version}-prebuilt_parsers.tar.gz
Source99: %{name}.rpmlintrc
#Patches
Patch0: patch-desktop-categories.patch
@@ -46,28 +47,28 @@
Patch8: mysql-workbench-preload-sqlparser.patch
# PATCH-FIX-UPSTREAM https://bugs.mysql.com/bug.php?id=83372
Patch9: mysql-workbench-gcc6.patch
+Patch10:mariadb-no-escape-string-quote.patch
+# patch from https://bugs.mysql.com/bug.php?id=84886
+Patch11:git_patch_105207009.patch
+# Patch from
https://git.archlinux.org/svntogit/community.git/tree/trunk/0005-gdal-use-CPLFree.patch?h=packages/mysql-workbench
+Patch1700: mysql-workbench-gdal-use-CPLFree.patch
BuildRequires: Mesa-devel
BuildRequires: ant
BuildRequires: binutils-gold
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_headers-devel
-%else
-BuildRequires: boost-devel
-%endif
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: fdupes
+BuildRequires: freetds-devel
BuildRequires: gcc-c++
BuildRequires: gnome-keyring-devel
-BuildRequires: gtkmm2-devel
+BuildRequires: gtkmm3-devel
BuildRequires: libmysqlclient-devel
-BuildRequires: libmysqlcppconn-devel
+BuildRequires: libmysqlcppconn-devel >= 1.1.8
BuildRequires: libmysqld-devel > 5.1
-BuildRequires: ninja
-# use bundled scintilla lib
-#BuildRequires: libscintilla-devel
+BuildRequires: libscintilla-devel
BuildRequires: libsigc++2-devel
BuildRequires: libtool
+BuildRequires: ninja
BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: python-paramiko
@@ -81,8 +82,8 @@
BuildRequires: pkgconfig(gdal)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libctemplate)
-BuildRequires: pkgconfig(libglade-2.0)
-BuildRequires: pkgconfig(libgnome-2.0)
+#BuildRequires: pkgconfig(libglade-2.0)
+#BuildRequires: pkgconfig(libgnome-2.0)
BuildRequires: pkgconfig(libpcrecpp)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libxml-2.0)
@@ -100,8 +101,8 @@
Requires: python-paramiko
Requires: python-pexpect
Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
Requires(post): shared-mime-info
+Requires(postun): desktop-file-utils
Requires(postun): shared-mime-info
Suggests: gnome-keyring
Suggests: mysqldump
@@ -114,7 +115,13 @@
Obsoletes: mysql-administrator < %{version}
Obsoletes: mysql-gui-tools < %{version}
Obsoletes: mysql-querybrovser < %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+ExcludeArch:%arm %ix86
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_headers-devel
+BuildRequires: libboost_system-devel
+%else
+BuildRequires: boost-devel
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2017-02-03 16:29:14
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2016-11-14 20:14:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2017-02-03 17:50:59.787919961 +0100
@@ -1,0 +2,5 @@
+Thu Feb 2 10:16:45 UTC 2017 - adam.ma...@suse.de
+
+- use individual libboost-*-devel packages instead of boost-devel
+
+---
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.huGveB/_old 2017-02-03 17:51:00.559811131 +0100
+++ /var/tmp/diff_new_pack.huGveB/_new 2017-02-03 17:51:00.563810567 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -49,7 +49,11 @@
BuildRequires: Mesa-devel
BuildRequires: ant
BuildRequires: binutils-gold
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_headers-devel
+%else
BuildRequires: boost-devel
+%endif
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: fdupes
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2016-11-14 20:14:55
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2016-08-13 18:30:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2016-11-14 20:14:57.0 +0100
@@ -1,0 +2,11 @@
+Sat Nov 12 11:13:22 UTC 2016 - mplus...@suse.com
+
+- Fix building with latest gcc6
+ * mysql-workbench-gcc6.patch
+
+---
+Sun Oct 9 08:09:17 UTC 2016 - mplus...@suse.com
+
+- Use ninja and gold linker to speedup building
+
+---
New:
mysql-workbench-gcc6.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.t65nLR/_old 2016-11-14 20:14:59.0 +0100
+++ /var/tmp/diff_new_pack.t65nLR/_new 2016-11-14 20:14:59.0 +0100
@@ -44,22 +44,28 @@
# disabled , system scintila is buil with gtk3
Patch7: mysql-workbench-unbundle-libscintilla.patch
Patch8: mysql-workbench-preload-sqlparser.patch
+# PATCH-FIX-UPSTREAM https://bugs.mysql.com/bug.php?id=83372
+Patch9: mysql-workbench-gcc6.patch
BuildRequires: Mesa-devel
BuildRequires: ant
+BuildRequires: binutils-gold
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gnome-keyring-devel
-BuildRequires: gtkmm24-devel
+BuildRequires: gtkmm2-devel
BuildRequires: libmysqlclient-devel
BuildRequires: libmysqlcppconn-devel
BuildRequires: libmysqld-devel > 5.1
+BuildRequires: ninja
# use bundled scintilla lib
#BuildRequires: libscintilla-devel
+BuildRequires: libsigc++2-devel
BuildRequires: libtool
BuildRequires: pkgconfig
+BuildRequires: python-devel
BuildRequires: python-paramiko
BuildRequires: swig
BuildRequires: tinyxml-devel
@@ -124,18 +130,20 @@
%patch6 -p1
#%%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
+%define __builder ninja
export CXXFLAGS="%{optflags} -std=c++11"
%cmake \
--DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \
--DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \
--DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -Wl,-fuse-ld=gold -pie"
\
+ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -Wl,-fuse-ld=gold
-pie" \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -Wl,-fuse-ld=gold
-pie" \
-DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
-DUSE_UNIXODBC=TRUE
-make %{?_smp_mflags}
+%make_jobs
%install
%cmake_install
++ mysql-workbench-gcc6.patch ++
>From 743c9cfb9d95f4dfcf2d4e1dc412fd5495100aac Mon Sep 17 00:00:00 2001
From: Christian Hesse
Date: Thu, 13 Oct 2016 10:56:55 +0200
Subject: [PATCH] fix compilation with gcc 6.2.1
Compilation fails with recent versions of gcc with:
error: cannot convert 'Glib::RefPtr' to 'bool' in
assignment
and
error: no match for 'operator!=' (operand types are
'Glib::RefPtr' and 'int')
This fixes compilation with gcc 6.2.1.
---
library/forms/gtk/src/lf_popover.cpp | 4 ++--
library/forms/gtk/src/lf_popup.cpp | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/library/forms/gtk/src/lf_popover.cpp
b/library/forms/gtk/src/lf_popover.cpp
index 1a659a6..7502811 100644
--- a/library/forms/gtk/src/lf_popover.cpp
+++ b/library/forms/gtk/src/lf_popover.cpp
@@ -380,7 +380,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
if (_style == mforms::PopoverStyleTooltip)
{
Glib::RefPtr wnd = this->get_window();
-if (wnd != 0)
+if (wnd)
{
int xx;
int yy;
@@ -396,7 +396,7 @@ void PopoverWidget::show_popover(const int rx, const int
ry, const mforms::Start
{
Gdk::ModifierType mask;
Glib::RefPtr dsp = Gdk::Display::get_default();
-if (dsp != 0)
+if (dsp)
dsp->get_pointer(x, y, mask);
}
diff --git a/library/forms/gtk/src/lf_popup.cpp
b/library/forms/gtk/src/lf_popup.cpp
index 289c511..5de3b49 100644
--- a/library/forms/gtk/src/lf_popup.cpp
+++ b/library/forms/gtk/src/lf_popup.cpp
@@ -81,7 +81,8 @@ void PopupImpl::on_screen_changed(const
Glib::RefPtr& screen)
{
d("\n");
Glib::RefPtr colormap = screen->get_rgba_colormap();
- _have_rgba = colormap;
+ if
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2016-08-13 18:30:04
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2016-07-27 16:12:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2016-08-13 18:30:05.0 +0200
@@ -1,0 +2,6 @@
+Fri Aug 5 15:48:58 UTC 2016 - mimi...@gmail.com
+
+- fix build on Leap:42.2 -- force -std=c++11
+- add _constraints file
+
+---
New:
_constraints
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.ucKxXk/_old 2016-08-13 18:30:06.0 +0200
+++ /var/tmp/diff_new_pack.ucKxXk/_new 2016-08-13 18:30:06.0 +0200
@@ -126,7 +126,7 @@
%patch8 -p1
%build
-# Drop the --no-undefined from LINKER flags as the cmakelists are too broken
+export CXXFLAGS="%{optflags} -std=c++11"
%cmake \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pie" \
++ _constraints ++
8
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2016-07-27 16:12:10
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2016-07-15 12:53:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2016-07-27 16:12:12.0 +0200
@@ -1,0 +2,14 @@
+Thu Jul 21 19:50:09 UTC 2016 - w01dn...@gmail.com
+
+- added mysql-workbench-preload-sqlparser.patch to preload
+ mysql-workbench/libsqlparser.so which is needed by
+ mysql-workbench/modules/db.mysql.sqlparser.grt.so
+ to open connection but isn't loaded
+
+---
+Wed Jul 20 11:22:29 UTC 2016 - mimi...@gmail.com
+
+- disable mysql-workbench-unbundle-libscintilla.patch , openSUSE
+scintilla is build with GTK3, but mysql-workbench with GTK2
+
+---
New:
mysql-workbench-preload-sqlparser.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.NENG8L/_old 2016-07-27 16:12:13.0 +0200
+++ /var/tmp/diff_new_pack.NENG8L/_new 2016-07-27 16:12:13.0 +0200
@@ -41,7 +41,9 @@
# remove json
Patch5: %{name}-no-json.patch
Patch6: %{name}-mysql-version.patch
+# disabled , system scintila is buil with gtk3
Patch7: mysql-workbench-unbundle-libscintilla.patch
+Patch8: mysql-workbench-preload-sqlparser.patch
BuildRequires: Mesa-devel
BuildRequires: ant
BuildRequires: boost-devel
@@ -54,7 +56,8 @@
BuildRequires: libmysqlclient-devel
BuildRequires: libmysqlcppconn-devel
BuildRequires: libmysqld-devel > 5.1
-BuildRequires: libscintilla-devel
+# use bundled scintilla lib
+#BuildRequires: libscintilla-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: python-paramiko
@@ -119,7 +122,8 @@
%patch3 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
+#%%patch7 -p1
+%patch8 -p1
%build
# Drop the --no-undefined from LINKER flags as the cmakelists are too broken
++ mysql-workbench-preload-sqlparser.patch ++
---
mysql-workbench-community-6.3.7-src.orig/frontend/linux/workbench/mysql-workbench.in
2016-06-08 15:51:41.0 +0300
+++
mysql-workbench-community-6.3.7-src/frontend/linux/workbench/mysql-workbench.in
2016-07-21 20:13:29.491388434 +0300
@@ -45,6 +45,14 @@
fi
fi
+if test -f $wblibdir/libsqlparser.so; then
+ if test "$LD_PRELOAD" != ""; then
+export LD_PRELOAD="$LD_PRELOAD:$wblibdir/libsqlparser.so"
+ else
+export LD_PRELOAD="$wblibdir/libsqlparser.so"
+ fi
+fi
+
# if libcairo and pixman are in the wb libraries dir, force them to be
preloaded
if test -f $wblibdir/libcairo.so.2; then
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2016-07-15 12:53:12
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is "mysql-workbench"
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2015-06-24 20:57:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2016-07-15 12:53:23.0 +0200
@@ -1,0 +2,31 @@
+Tue Jul 12 14:46:04 UTC 2016 - tchva...@suse.com
+
+- Reduce some pointless comments
+- Use normal paralel build
+- Switch to pkgconfig style deps where possible
+- Unbundle scintilla:
+ * mysql-workbench-unbundle-libscintilla.patch
+- Use %cmake macros fully
+
+---
+Mon Jul 11 19:00:49 UTC 2016 - mimi...@gmail.com
+
+- update to version 6.3.7
+ https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-7.html
+ https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-6.html
+ https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-5.html
+- dropped patches:
+ mysql-workbench-community-6.3.3-src-mysql_options4.patch
+- refreshed patches:
+ mysql-workbench-cmake-3.2.patch
+ mysql-workbench-no-check-for-updates.patch
+ patch-desktop-categories.patch
+- added patches:
+mysql-workbench-mysql-version.patch - relax mysql version req.
+mysql-workbench-mysql_options4.patch - disable options4, doesn't work as
+ supposed with MariaDB
+mysql-workbench-no-json.patch - disable JSON support, no antlr3 in openSUSE
+- removed support for unsupported distributions
+- openSUSE_(Vendor_Package).xml renamed to openSUSE_Vendor_Package.xml
+
+---
Old:
mysql-workbench-community-6.3.3-src-mysql_options4.patch
mysql-workbench-community-6.3.4-src.tar.gz
openSUSE_(Vendor_Package).xml
New:
mysql-workbench-community-6.3.7-src.tar.gz
mysql-workbench-mysql-version.patch
mysql-workbench-mysql_options4.patch
mysql-workbench-no-json.patch
mysql-workbench-unbundle-libscintilla.patch
openSUSE_Vendor_Package.xml
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.mXrl8r/_old 2016-07-15 12:53:25.0 +0200
+++ /var/tmp/diff_new_pack.mXrl8r/_new 2016-07-15 12:53:25.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,104 +17,83 @@
%define edition community
-
-# whether at least Python 2.6 is available
-%define have_python26 1
-%include %{_rpmconfigdir}/macros.python
-
+Name: mysql-workbench
+Version:6.3.7
+Release:0
Summary:A MySQL visual database modeling, administration and querying
tool
License:GPL-2.0+
Group: Productivity/Databases/Clients
-Name: mysql-workbench
-Version:6.3.4
-Release:0
Url:http://wb.mysql.com
-Source: %{name}-%{edition}-%{version}-src.tar.gz
-Source1:openSUSE_(Vendor_Package).xml
+Source:
http://dev.mysql.com/get/Downloads/MySQLGUITools/%{name}-%{edition}-%{version}-src.tar.gz
+Source1:openSUSE_Vendor_Package.xml
Source99: %{name}.rpmlintrc
-
#Patches
-# PATCH-FIX-OPENSUSE -- Add categories and generic name to .desktop file
Patch0: patch-desktop-categories.patch
-# PATCH-FIX-OPENSUSE -- Remove "check for update" in help, we use a package
manager for that
-Patch2: mysql-workbench-no-check-for-updates.patch
-# PATCH-FIX-OPENSUSE -- Fix build error "copytable.cpp:1638: undefined
reference to `mysql_options4'"
-# This only exist in mysql 5.6.x, but the "if" code didn't work, so disable it
-Patch3: mysql-workbench-community-6.3.3-src-mysql_options4.patch
+# Remove check for update in help
+Patch1: mysql-workbench-no-check-for-updates.patch
+# Fix build error
+# copytable.cpp:1638: undefined reference to `mysql_options4'
+# This only exist in mysql 5.6.x but the if code didn't work
+# So disable it
+Patch2: mysql-workbench-mysql_options4.patch
# PATCH-FIX-UPSTREAM sfal...@opensuse.org
-Patch4: mysql-workbench-cmake-3.2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-# Keep them alphabetic order
-BuildRequires: Mesa
+Patch3: mysql-workbench-cmake-3.2.patch
+# remove json
+Patch5: %{name}-no-json.patch
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2015-06-24 20:57:08
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2015-06-09 08:50:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2015-06-24 20:57:09.0 +0200
@@ -1,0 +2,27 @@
+Wed Jun 23 10:00:01 UTC 2015 - a...@ajaissle.de
+
+- update to version 6.3.4
+ https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-4.html
+
+- update to version 6.3.3
+ https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-3-3.html
+
+- update to version 6.2.5
+ https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-2-5.html
+
+- update to version 6.2.4
+ https://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-2-4.html
+
+- Rebased Patch:
+ * mysql-workbench-mysql_options4.patch as
+mysql-workbench-community-6.3.3-src-mysql_options4.patch
+ * mysql-workbench-cmake-3.2.patch
+
+- Removed Patches:
+ - mysql-workbench-ctemplate.patch (fixed in 6.2.5)
+ - mysql-workbench-glib.patch (fixed in 6.3.3)
+
+- Requires antlr-java = 3.4 for build. As we have no package for
+ that, yet, we use the bundled antlr.
+
+---
Old:
mysql-workbench-community-6.2.3-src.tar.gz
mysql-workbench-ctemplate.patch
mysql-workbench-glib.patch
mysql-workbench-mysql_options4.patch
New:
mysql-workbench-community-6.3.3-src-mysql_options4.patch
mysql-workbench-community-6.3.4-src.tar.gz
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.1z4krx/_old 2015-06-24 20:57:10.0 +0200
+++ /var/tmp/diff_new_pack.1z4krx/_new 2015-06-24 20:57:10.0 +0200
@@ -26,7 +26,7 @@
License:GPL-2.0+
Group: Productivity/Databases/Clients
Name: mysql-workbench
-Version:6.2.3
+Version:6.3.4
Release:0
Url:http://wb.mysql.com
Source: %{name}-%{edition}-%{version}-src.tar.gz
@@ -34,21 +34,15 @@
Source99: %{name}.rpmlintrc
#Patches
+# PATCH-FIX-OPENSUSE -- Add categories and generic name to .desktop file
Patch0: patch-desktop-categories.patch
-# fix deprecated calls to tpl-ReloadIfChanged
-# http://bugs.mysql.com/72585
-Patch1: mysql-workbench-ctemplate.patch
-# Remove check for update in help
+# PATCH-FIX-OPENSUSE -- Remove check for update in help, we use a package
manager for that
Patch2: mysql-workbench-no-check-for-updates.patch
-# Fix build error
-# copytable.cpp:1638: undefined reference to `mysql_options4'
-# This only exist in mysql 5.6.x but the if code didn't work
-# So disable it
-Patch3: mysql-workbench-mysql_options4.patch
+# PATCH-FIX-OPENSUSE -- Fix build error copytable.cpp:1638: undefined
reference to `mysql_options4'
+# This only exist in mysql 5.6.x, but the if code didn't work, so disable it
+Patch3: mysql-workbench-community-6.3.3-src-mysql_options4.patch
# PATCH-FIX-UPSTREAM sfal...@opensuse.org
Patch4: mysql-workbench-cmake-3.2.patch
-# PATCH-FIX-UPSTREAM mysql-workbench-glib.patch http://bugs.mysql.com/74147,
boo#904767 wba...@tmo.at -- fix empty grid result
-Patch5: mysql-workbench-glib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Keep them alphabetic order
@@ -56,7 +50,8 @@
BuildRequires: Mesa-devel
BuildRequires: Mesa-libGL-devel
BuildRequires: ant
-BuildRequires: ant-antlr
+#BuildRequires: ant-antlr
+#BuildRequires: antlr-java = 3.4
BuildRequires: boost-devel
BuildRequires: cairo-devel = 1.5.12
BuildRequires: cairomm-devel
@@ -142,11 +137,9 @@
# Add the -D flag if you don't want to delete the source root on each build
%setup -q -n %{name}-%{edition}-%{version}-src
%patch0
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
# FIX this is too much on obs Out of Memory use
@@ -154,6 +147,10 @@
# make %%{?jobs:-j2}
export PATH=$PWD/bin:$PATH
+
+# Find and use antlr = 3.4 but 4.x
+#export ANTLR_JAR_PATH=`find %%{_javadir} -name antlr-3.*-complete.jar`
+
# Not using cmake macro as it sets modules LDFLAGS in way that
# workbench doesn't work afterwards - more investigation needed.
%if 0
@@ -196,13 +193,13 @@
install -m 0644 %{S:1} %{buildroot}/usr/share/mysql-workbench/mysql.profiles
-mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
echo %{_libdir}/%{name}
%{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
-chmod 644
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2015-06-09 08:49:26
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2015-03-30 19:33:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2015-06-09 08:50:30.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun 5 14:55:21 UTC 2015 - wba...@tmo.at
+
+- added mysql-workbench-glib.patch: fix empty grid result
+ (http://bugs.mysql.com/74147, boo#904767)
+
+---
New:
mysql-workbench-glib.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.IeruYz/_old 2015-06-09 08:50:31.0 +0200
+++ /var/tmp/diff_new_pack.IeruYz/_new 2015-06-09 08:50:31.0 +0200
@@ -47,6 +47,8 @@
Patch3: mysql-workbench-mysql_options4.patch
# PATCH-FIX-UPSTREAM sfal...@opensuse.org
Patch4: mysql-workbench-cmake-3.2.patch
+# PATCH-FIX-UPSTREAM mysql-workbench-glib.patch http://bugs.mysql.com/74147,
boo#904767 wba...@tmo.at -- fix empty grid result
+Patch5: mysql-workbench-glib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Keep them alphabetic order
@@ -144,6 +146,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
# FIX this is too much on obs Out of Memory use
++ mysql-workbench-glib.patch ++
diff -rup a/frontend/linux/linux_utilities/listmodel_wrapper.cpp
b/frontend/linux/linux_utilities/listmodel_wrapper.cpp
--- a/frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-06-20
21:18:09.0 +0200
+++ b/frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-11-10
23:37:43.645824317 +0100
@@ -528,7 +528,6 @@ void ColumnsModel::add_model_column(Gtk:
ListModelWrapper::ListModelWrapper(bec::ListModel* tm, Gtk::TreeView
*treeview, const std::string name)
: Glib::ObjectBase(typeid(ListModelWrapper))
, Glib::Object()
-, Gtk::TreeModel()
, _treeview(treeview)
, _iconview(0)
, _context_menu(0)
diff -rup a/frontend/linux/linux_utilities/listmodel_wrapper.h
b/frontend/linux/linux_utilities/listmodel_wrapper.h
--- a/frontend/linux/linux_utilities/listmodel_wrapper.h2014-06-20
21:18:09.0 +0200
+++ b/frontend/linux/linux_utilities/listmodel_wrapper.h2014-11-10
23:37:43.645824317 +0100
@@ -232,9 +232,16 @@ inline bool can_convert(const Glib::ustr
//==
-class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
+#if GLIB_CHECK_VERSION(2, 42, 0)
+class ListModelWrapper : public Gtk::TreeModel, public Glib::Object,
public Gtk::TreeDragDest, public Gtk::TreeDragSource,
public base::trackable
+#else
+class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
+ public base::trackable
+
+#endif
{
friend class ColumnsModel;
protected:
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2015-03-30 19:33:22
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2015-02-11 16:44:50.0 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2015-03-30 19:33:23.0 +0200
@@ -1,0 +2,8 @@
+Fri Mar 27 16:08:01 UTC 2015 - sfal...@opensuse.org
+
+- Patched to work with CMake =3.2, as X11 is no longer magically
+ implied as a linked library
+- Added:
+ + mysql-workbench-cmake-3.2.patch
+
+---
New:
mysql-workbench-cmake-3.2.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.cJLExC/_old 2015-03-30 19:33:25.0 +0200
+++ /var/tmp/diff_new_pack.cJLExC/_new 2015-03-30 19:33:25.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,6 +45,8 @@
# This only exist in mysql 5.6.x but the if code didn't work
# So disable it
Patch3: mysql-workbench-mysql_options4.patch
+# PATCH-FIX-UPSTREAM sfal...@opensuse.org
+Patch4: mysql-workbench-cmake-3.2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Keep them alphabetic order
@@ -141,6 +143,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
# FIX this is too much on obs Out of Memory use
++ mysql-workbench-cmake-3.2.patch ++
Index: mysql-workbench-community-6.2.3-src/CMakeLists.txt
===
--- mysql-workbench-community-6.2.3-src.orig/CMakeLists.txt
+++ mysql-workbench-community-6.2.3-src/CMakeLists.txt
@@ -77,6 +77,7 @@ endif()
find_package(LibXml2 REQUIRED)
find_package(OpenGL REQUIRED)
+find_package(X11 REQUIRED)
find_package(CTemplate)
find_package(MySQLCppConn REQUIRED)
Index:
mysql-workbench-community-6.2.3-src/frontend/linux/workbench/CMakeLists.txt
===
---
mysql-workbench-community-6.2.3-src.orig/frontend/linux/workbench/CMakeLists.txt
+++ mysql-workbench-community-6.2.3-src/frontend/linux/workbench/CMakeLists.txt
@@ -50,6 +50,7 @@ include_directories(.
${LIBZIP_INCLUDE_DIRS}
${MYSQLCPPCONN_INCLUDE_DIRS}
${GRT_INCLUDE_DIRS}
+${X11_INCLUDE_DIR}
)
#link_directories(${PROJECT_BINARY_DIR}/mysqlcppconnector/lib
${PROJECT_BINARY_DIR}/antlr-wb)
@@ -102,6 +103,7 @@ target_link_libraries(mysql-workbench-bi
${LIBZIP_LIBRARIES}
${MYSQL_LIBRARIES}
${SQLITE3_LIBRARIES}
+${X11_LIBRARIES}
)
install(TARGETS mysql-workbench-bin DESTINATION ${WB_INSTALL_DIR_EXECUTABLE})
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2015-02-11 16:44:48
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2014-09-19 15:45:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2015-02-11 16:44:50.0 +0100
@@ -1,0 +2,10 @@
+Thu Oct 2 04:35:30 UTC 2014 - ec...@schirra.net
+
+- update to version 6.2.3
+ http://dev.mysql.com/doc/relnotes/workbench/en/changes-6-2.html
+- use unixodbc instead of libiodbc
+ - change DUSE_UNIXODBC from false to true,
+ - remove BuildRequires libiodbc-devel
+- insert libgdal-devel and postgresql-devel
+
+---
Old:
mysql-workbench-community-6.1.7-src.tar.gz
New:
mysql-workbench-community-6.2.3-src.tar.gz
mysql-workbench.rpmlintrc
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.pgXt0f/_old 2015-02-11 16:44:51.0 +0100
+++ /var/tmp/diff_new_pack.pgXt0f/_new 2015-02-11 16:44:51.0 +0100
@@ -26,11 +26,12 @@
License:GPL-2.0+
Group: Productivity/Databases/Clients
Name: mysql-workbench
-Version:6.1.7
+Version:6.2.3
Release:0
Url:http://wb.mysql.com
Source: %{name}-%{edition}-%{version}-src.tar.gz
Source1:openSUSE_(Vendor_Package).xml
+Source99: %{name}.rpmlintrc
#Patches
Patch0: patch-desktop-categories.patch
@@ -63,9 +64,9 @@
BuildRequires: gnome-keyring-devel
BuildRequires: gtkmm24-devel
BuildRequires: libctemplate-devel
+BuildRequires: libgdal-devel
BuildRequires: libglade2-devel
BuildRequires: libgnome-devel
-BuildRequires: libiodbc-devel
BuildRequires: libmysqlclient-devel
BuildRequires: libmysqlcppconn-devel
BuildRequires: libmysqld-devel
@@ -73,6 +74,8 @@
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libzip-devel
+BuildRequires: postgresql-devel
+BuildRequires: unixODBC-devel
BuildRequires: vsqlite++-devel
%if 0%{?suse_version} 1210
BuildRequires: lua51-devel
@@ -83,7 +86,6 @@
BuildRequires: mysql-devel 5.1
BuildRequires: pcre-devel
BuildRequires: python-devel
-BuildRequires: pkgconfig(libiodbc)
BuildRequires: pkgconfig(xxf86vm)
%if 0%{?suse_version}
BuildRequires: libuuid-devel
@@ -154,7 +156,7 @@
%cmake -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
- -DUSE_UNIXODBC=FALSE \
+ -DUSE_UNIXODBC=TRUE \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_SKIP_INSTALL_RPATH=ON \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
@@ -167,7 +169,7 @@
-DLIB_INSTALL_DIR=%{_libdir} \
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
- -DUSE_UNIXODBC=FALSE \
+ -DUSE_UNIXODBC=TRUE \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_SKIP_INSTALL_RPATH=ON \
-DCMAKE_NO_BUILTIN_CHRPATH=ON \
++ mysql-workbench-community-6.1.7-src.tar.gz -
mysql-workbench-community-6.2.3-src.tar.gz ++
/work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-6.1.7-src.tar.gz
/work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-community-6.2.3-src.tar.gz
differ: char 5, line 1
++ mysql-workbench-mysql_options4.patch ++
--- /var/tmp/diff_new_pack.pgXt0f/_old 2015-02-11 16:44:52.0 +0100
+++ /var/tmp/diff_new_pack.pgXt0f/_new 2015-02-11 16:44:52.0 +0100
@@ -1,9 +1,8 @@
-diff --git a/plugins/migration/copytable/copytable.cpp
b/plugins/migration/copytable/copytable.cpp
-index b273287..77c227b 100644
a/plugins/migration/copytable/copytable.cpp
-+++ b/plugins/migration/copytable/copytable.cpp
-@@ -1633,11 +1633,16 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const
std::string hostname, int port,
- _truncate = false;
+diff -Pdpru
mysql-workbench-community-6.2.3-src.orig/plugins/migration/copytable/copytable.cpp
mysql-workbench-community-6.2.3-src/plugins/migration/copytable/copytable.cpp
+---
mysql-workbench-community-6.2.3-src.orig/plugins/migration/copytable/copytable.cpp
2014-09-15 18:12:58.0 +0200
mysql-workbench-community-6.2.3-src/plugins/migration/copytable/copytable.cpp
2014-09-27 16:31:13.874689080 +0200
+@@ -1888,11 +1888,16 @@ MySQLCopyDataTarget::MySQLCopyDataTarget
+ _incoming_data_charset = latin1;
mysql_init(_mysql);
+ /* This is optional has compiled in for MySQL = 5.6.6
++ mysql-workbench.rpmlintrc ++
# files required during runtime by
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2014-09-19 13:56:27
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2014-07-20 10:49:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2014-09-19 15:45:37.0 +0200
@@ -1,0 +2,12 @@
+Thu Sep 11 18:13:07 UTC 2014 - michal.hruse...@opensuse.org
+
+- not using %cmake macro for now, causes too much troubles,
+ needs further investigation
+
+---
+Sun Sep 7 12:16:37 UTC 2014 - michal.hruse...@opensuse.org
+
+- fix build by ommiting -Wl,--no-undefined
+- adding -Wl,-z,relro
+
+---
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.ShxLc2/_old 2014-09-19 15:45:40.0 +0200
+++ /var/tmp/diff_new_pack.ShxLc2/_new 2014-09-19 15:45:40.0 +0200
@@ -114,15 +114,15 @@
Suggests: gnome-keyring
Suggests: mysqldump
-Provides: %{name}-%{edition}
Provides: mysql-administrator = %{version}
Provides: mysql-gui-tools = %{version}
Provides: mysql-querybrovser = %{version}
+Provides: mysql-workbench-%{edition}
Obsoletes: mysql-administrator %{version}
Obsoletes: mysql-gui-tools %{version}
Obsoletes: mysql-querybrovser %{version}
-Conflicts: %{name}-oss
-Conflicts: %{name}-com-se
+Conflicts: mysql-workbench-oss
+Conflicts: mysql-workbench-com-se
%description
MySQL Workbench is a modeling tool that allows you to design
@@ -146,17 +146,18 @@
# make %%{?jobs:-j2}
export PATH=$PWD/bin:$PATH
-%if 0%{?suse_version} = 1310
+# Not using cmake macro as it sets modules LDFLAGS in way that
+# workbench doesn't work afterwards - more investigation needed.
+%if 0
# Make things more secure, but only on new version
- #export LDFLAGS=-Wl,-z,relro,-z,now -pie
- export CFLAGS=%{optflags} -fPIE -pie
- export CXXFLAGS=%{optflags} -fPIE -pie
- %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
- -DLIB_INSTALL_DIR=%{_libdir} \
+ export LDFLAGS=-Wl,-z,relro,-z,now -pie
+ %cmake -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
-DUSE_UNIXODBC=FALSE \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_SKIP_INSTALL_RPATH=ON \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
..
make VERBOSE=1 %{?jobs:-j2}
%else
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2014-07-20 10:49:50
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2014-07-10 14:55:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2014-07-20 10:49:51.0 +0200
@@ -1,0 +2,10 @@
+Wed Jul 16 04:43:13 UTC 2014 - ec...@schirra.net
+
+- insert libmysqlclient-devel for missing link
+ (could not login mysqlserver)
+- change lib in libdir in DLIB_INSTALL_DIR
+ (workbench dont#'t start)
+- comment out LDFLAGS
+ (could only start as root, missing libgcc_s1)
+
+---
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.LuLU25/_old 2014-07-20 10:49:52.0 +0200
+++ /var/tmp/diff_new_pack.LuLU25/_new 2014-07-20 10:49:52.0 +0200
@@ -103,6 +103,7 @@
Requires(post):desktop-file-utils
Requires(postun): desktop-file-utils
+Requires: libmysqlclient-devel
Requires: python-paramiko
Requires: python-pexpect
@@ -147,12 +148,12 @@
export PATH=$PWD/bin:$PATH
%if 0%{?suse_version} = 1310
# Make things more secure, but only on new version
- export LDFLAGS=-Wl,-z,relro,-z,now -pie
+ #export LDFLAGS=-Wl,-z,relro,-z,now -pie
export CFLAGS=%{optflags} -fPIE -pie
export CXXFLAGS=%{optflags} -fPIE -pie
%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
- -DLIB_INSTALL_DIR=%{_lib} \
+ -DLIB_INSTALL_DIR=%{_libdir} \
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
-DUSE_UNIXODBC=FALSE \
@@ -162,7 +163,7 @@
pushd build
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
- -DLIB_INSTALL_DIR=%{_lib} \
+ -DLIB_INSTALL_DIR=%{_libdir} \
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
-DUSE_UNIXODBC=FALSE \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2014-07-10 14:55:23
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2014-05-03 16:56:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2014-07-10 14:55:37.0 +0200
@@ -1,0 +2,13 @@
+Sun Jul 6 14:46:08 UTC 2014 - br...@ioda-net.ch
+
+- update to version 6.1.7
+- Fix compilation issues on several distribution
+- Added patch fixing build error inexistant mysql_option4
+ mysql-workbench-mysql_options4.patch
+- Added patch to remove help check for upgrade
+ mysql-workbench-no-check-for-updates.patch
+- Added patch to fix deprecate call ctemplate
+ mysql-workbench-ctemplate.patch
+ upstream bug http://bugs.mysql.com/72585
+
+---
Old:
mysql-workbench-community-6.1.4-src.tar.gz
New:
mysql-workbench-community-6.1.7-src.tar.gz
mysql-workbench-ctemplate.patch
mysql-workbench-mysql_options4.patch
mysql-workbench-no-check-for-updates.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.78mGGJ/_old 2014-07-10 14:55:39.0 +0200
+++ /var/tmp/diff_new_pack.78mGGJ/_new 2014-07-10 14:55:39.0 +0200
@@ -26,7 +26,7 @@
License:GPL-2.0+
Group: Productivity/Databases/Clients
Name: mysql-workbench
-Version:6.1.4
+Version:6.1.7
Release:0
Url:http://wb.mysql.com
Source: %{name}-%{edition}-%{version}-src.tar.gz
@@ -34,6 +34,16 @@
#Patches
Patch0: patch-desktop-categories.patch
+# fix deprecated calls to tpl-ReloadIfChanged
+# http://bugs.mysql.com/72585
+Patch1: mysql-workbench-ctemplate.patch
+# Remove check for update in help
+Patch2: mysql-workbench-no-check-for-updates.patch
+# Fix build error
+# copytable.cpp:1638: undefined reference to `mysql_options4'
+# This only exist in mysql 5.6.x but the if code didn't work
+# So disable it
+Patch3: mysql-workbench-mysql_options4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Keep them alphabetic order
@@ -56,7 +66,9 @@
BuildRequires: libglade2-devel
BuildRequires: libgnome-devel
BuildRequires: libiodbc-devel
+BuildRequires: libmysqlclient-devel
BuildRequires: libmysqlcppconn-devel
+BuildRequires: libmysqld-devel
BuildRequires: libsigc++2-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
@@ -91,7 +103,6 @@
Requires(post):desktop-file-utils
Requires(postun): desktop-file-utils
-Requires: libmysqlclient-devel
Requires: python-paramiko
Requires: python-pexpect
@@ -124,31 +135,49 @@
# Add the -D flag if you don't want to delete the source root on each build
%setup -q -n %{name}-%{edition}-%{version}-src
%patch0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
+# FIX this is too much on obs Out of Memory use
+# %%{?_smp_mflags} could it be in _constraint ?
+# make %%{?jobs:-j2}
export PATH=$PWD/bin:$PATH
-export CFLAGS=%{optflags}
-export CXXFLAGS=$CFLAGS
-LIB_SUFFIX=%{_lib}
-LIB_SUFFIX=${LIB_SUFFIX#lib}
-cmake \
- -DLIB_INSTALL_DIR=%{_libdir} \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIB_SUFFIX=$LIB_SUFFIX \
+%if 0%{?suse_version} = 1310
+# Make things more secure, but only on new version
+ export LDFLAGS=-Wl,-z,relro,-z,now -pie
+ export CFLAGS=%{optflags} -fPIE -pie
+ export CXXFLAGS=%{optflags} -fPIE -pie
+ %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
+ -DLIB_INSTALL_DIR=%{_lib} \
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
- -DUSE_UNIXODBC=FALSE
-
-#%%__make %%{?_smp_mflags}
-
-#if too much FIX this is too much on obs Out of Memory use
-make %{?jobs:-j2}
+ -DUSE_UNIXODBC=FALSE \
+ ..
+ make VERBOSE=1 %{?jobs:-j2}
+%else
+ pushd build
+ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
+ -DLIB_INSTALL_DIR=%{_lib} \
+ -DCMAKE_BUILD_TYPE=%{edition} \
+ -DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
+ -DUSE_UNIXODBC=FALSE \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_SKIP_INSTALL_RPATH=ON \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+ ..
+ make VERBOSE=1 %{?jobs:-j2}
+ popd
+%endif
%install
-%__make install DESTDIR=%{buildroot}
-
+pushd build
+make VERBOSE=1 DESTDIR=%{buildroot} %{?jobs:-j2} install
+popd
#Can't we split that in a -doc package ?
#rm -fr
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2014-05-03 16:56:54
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2014-02-05 13:44:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2014-05-03 16:56:55.0 +0200
@@ -1,0 +2,12 @@
+Wed Apr 23 15:58:03 UTC 2014 - ec...@schirra.net
+
+- update to version 6.1.4
+
+---
+Thu Feb 6 21:01:18 UTC 2014 - ec...@schirra.net
+
+- update to 6.0.9
+- insert Requires: libmysqlclient-devel because of absence symlink
+ of libmysqlclient_r.so
+
+---
Old:
mysql-workbench-community-6.0.8-src.tar.bz2
New:
mysql-workbench-community-6.1.4-src.tar.gz
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.16Ahk4/_old 2014-05-03 16:56:57.0 +0200
+++ /var/tmp/diff_new_pack.16Ahk4/_new 2014-05-03 16:56:57.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,10 +26,10 @@
License:GPL-2.0+
Group: Productivity/Databases/Clients
Name: mysql-workbench
-Version:6.0.8
+Version:6.1.4
Release:0
Url:http://wb.mysql.com
-Source: %{name}-%{edition}-%{version}-src.tar.bz2
+Source: %{name}-%{edition}-%{version}-src.tar.gz
Source1:openSUSE_(Vendor_Package).xml
#Patches
@@ -82,6 +82,7 @@
BuildRequires: libuuid-devel
BuildRequires: sqlite-devel
%endif
+BuildRequires: swig
BuildRequires: tar
BuildRequires: tinyxml-devel
@@ -90,6 +91,7 @@
Requires(post):desktop-file-utils
Requires(postun): desktop-file-utils
+Requires: libmysqlclient-devel
Requires: python-paramiko
Requires: python-pexpect
@@ -139,7 +141,7 @@
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
-DUSE_UNIXODBC=FALSE
-#%__make %{?_smp_mflags}
+#%%__make %%{?_smp_mflags}
#if too much FIX this is too much on obs Out of Memory use
make %{?jobs:-j2}
@@ -148,7 +150,7 @@
%__make install DESTDIR=%{buildroot}
#Can't we split that in a -doc package ?
-#rm -fr %{buildroot}/usr/share/doc/%{name}
+#rm -fr %%{buildroot}/usr/share/doc/%%{name}
find %{buildroot}%{_libdir}/%{name} -name \*.a -exec rm {} \; -print
find %{buildroot}%{_libdir}/%{name} -name \*.la -exec rm {} \; -print
@@ -170,13 +172,13 @@
%icon_theme_cache_post
%mime_database_post
%desktop_database_post
-%run_ldconfig
+/sbin/ldconfig
%postun
%icon_theme_cache_postun
%mime_database_postun
%desktop_database_postun
-%run_ldconfig
+/sbin/ldconfig
%files
%defattr(0644, root, root, 0755)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2014-02-05 13:44:56
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2013-08-23 11:07:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2014-02-05 13:44:58.0 +0100
@@ -1,0 +2,18 @@
+Mon Oct 7 10:37:52 CEST 2013 - mhruse...@suse.cz
+
+- updated to version 6.0.7
+ http://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-0-7.html
+- further cleanup of spec file
+
+---
+Tue Aug 20 08:43:58 UTC 2013 - br...@ioda-net.ch
+
+- update to version 6.0.6
+ * see http://www.mysql.com/products/workbench/
+- packaging : cleaning old options, wb use cmake now
+ removed no more used patches
+ mysql-workbench-gpl-5.2.44-ctemplate-fix.patch
+ mysql-workbench-gpl-5.2.44-avoid-version.patch
+ mysql-workbench-5.2.47-system-cppconn.patch
+
+---
Old:
mysql-workbench-5.2.47-system-cppconn.patch
mysql-workbench-gpl-5.2.44-avoid-version.patch
mysql-workbench-gpl-5.2.44-ctemplate-fix.patch
mysql-workbench-gpl-5.2.47-src.tar.bz2
New:
mysql-workbench-community-6.0.8-src.tar.bz2
patch-desktop-categories.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.QxCBvO/_old 2014-02-05 13:45:00.0 +0100
+++ /var/tmp/diff_new_pack.QxCBvO/_new 2014-02-05 13:45:00.0 +0100
@@ -16,200 +16,196 @@
#
-Name: mysql-workbench
-Summary:A MySQL visual modeling tool
+%define edition community
+
+# whether at least Python 2.6 is available
+%define have_python26 1
+%include %{_rpmconfigdir}/macros.python
+
+Summary:A MySQL visual database modeling, administration and querying
tool
License:GPL-2.0+
Group: Productivity/Databases/Clients
-Version:5.2.47
+Name: mysql-workbench
+Version:6.0.8
Release:0
-Url:http://dev.mysql.com/downloads/workbench
-Source: %{name}-gpl-%{version}-src.tar.bz2
+Url:http://wb.mysql.com
+Source: %{name}-%{edition}-%{version}-src.tar.bz2
Source1:openSUSE_(Vendor_Package).xml
-Patch0: mysql-workbench-gpl-5.2.44-ctemplate-fix.patch
-Patch1: mysql-workbench-gpl-5.2.44-avoid-version.patch
-Patch2: mysql-workbench-5.2.47-system-cppconn.patch
-Summary:A MySQL visual modeling tool
-Group: Productivity/Databases/Clients
+
+#Patches
+Patch0: patch-desktop-categories.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+# Keep them alphabetic order
BuildRequires: Mesa
BuildRequires: Mesa-devel
+BuildRequires: Mesa-libGL-devel
+BuildRequires: ant
+BuildRequires: ant-antlr
BuildRequires: boost-devel
+BuildRequires: cairo-devel = 1.5.12
BuildRequires: cairomm-devel
+BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
+BuildRequires: gnome-keyring-devel
BuildRequires: gtkmm24-devel
-BuildRequires: java-devel
+BuildRequires: libctemplate-devel
BuildRequires: libglade2-devel
BuildRequires: libgnome-devel
+BuildRequires: libiodbc-devel
BuildRequires: libmysqlcppconn-devel
BuildRequires: libsigc++2-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libzip-devel
+BuildRequires: vsqlite++-devel
%if 0%{?suse_version} 1210
BuildRequires: lua51-devel
%else
BuildRequires: lua-devel
%endif
-BuildRequires: mysql-devel
+BuildRequires: make
+BuildRequires: mysql-devel 5.1
BuildRequires: pcre-devel
-BuildRequires: php-devel
BuildRequires: python-devel
-BuildRequires: readline-devel
BuildRequires: pkgconfig(libiodbc)
BuildRequires: pkgconfig(xxf86vm)
%if 0%{?suse_version}
-BuildRequires: FastCGI-devel
BuildRequires: libuuid-devel
BuildRequires: sqlite3-devel
BuildRequires: update-desktop-files
%endif
%if 0%{?fedora}
-BuildRequires: fcgi-devel
-BuildRequires: java-1.6.0-openjdk-devel
-BuildRequires: sqlite-devel
-%if 0%{?fedora} 11
BuildRequires: libuuid-devel
-%else
-BuildRequires: PolicyKit-gnome
-%endif
+BuildRequires: sqlite-devel
%endif
-BuildRequires: cairo-devel = 1.5.12
-BuildRequires: libctemplate-devel
-BuildRequires: libiodbc-devel
+BuildRequires: tar
+BuildRequires: tinyxml-devel
+
Requires(post):shared-mime-info
Requires(postun): shared-mime-info
Requires(post):
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2013-08-23 11:07:57
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2013-06-05 17:45:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2013-08-23 11:07:59.0 +0200
@@ -1,0 +2,10 @@
+Wed Aug 7 11:23:58 UTC 2013 - gan...@opensuse.org
+
+- Add symbolic link to libmysqlclient_r
+
+---
+Thu Jun 6 08:22:14 UTC 2013 - mhruse...@suse.com
+
+- ugly hack around loading cppconnector manually
+
+---
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.6gFe4b/_old 2013-08-23 11:08:00.0 +0200
+++ /var/tmp/diff_new_pack.6gFe4b/_new 2013-08-23 11:08:00.0 +0200
@@ -85,6 +85,8 @@
Requires(postun): desktop-file-utils
Requires: python-paramiko
Requires: python-pexpect
+# Need for SQL Editor
+Requires: libmysqlclient_r18
Provides: mysql-administrator = %{version}
Provides: mysql-gui-tools = %{version}
Provides: mysql-querybrovser = %{version}
@@ -178,6 +180,9 @@
chmod +x %{buildroot}%{_datadir}/%{name}/extras/build_freetds.sh
%fdupes -s $RPM_BUILD_ROOT
+cd %{buildroot}%{_libdir}/%{name}
+ln -s ../libmysqlcppconn.so.[0-9] mysqlcppconn.so
+ln -s ../libmysqlclient_r.so.[0-9][0-9] libmysqlclient_r.so
%post
%mime_database_post
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2013-06-05 17:45:57
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2013-03-21 10:40:09.0 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2013-06-05 17:45:58.0 +0200
@@ -1,0 +2,7 @@
+Tue Jun 4 14:47:06 UTC 2013 - mhruse...@suse.com
+
+- Fixed build against Factory (gtkmm/*.h - gtkmm.h)
+- Use system c++-connector:
+ mysql-workbench-5.2.47-system-cppconn.patch
+
+---
New:
mysql-workbench-5.2.47-system-cppconn.patch
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.tBdoRk/_old 2013-06-05 17:45:59.0 +0200
+++ /var/tmp/diff_new_pack.tBdoRk/_new 2013-06-05 17:45:59.0 +0200
@@ -27,6 +27,7 @@
Source1:openSUSE_(Vendor_Package).xml
Patch0: mysql-workbench-gpl-5.2.44-ctemplate-fix.patch
Patch1: mysql-workbench-gpl-5.2.44-avoid-version.patch
+Patch2: mysql-workbench-5.2.47-system-cppconn.patch
Summary:A MySQL visual modeling tool
Group: Productivity/Databases/Clients
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -102,12 +103,19 @@
%setup -q -n %{name}-gpl-%{version}-src
%patch0 -p1
%patch1 -p1
+%patch2
for j in gpattern.h gmessages.h gthread.h gbase64.h gunicode.h gerror.h
gquark.h gtypes.h gmacros.h ; do
for i in `grep -Rl glib/$j .`; do
- sed -i s|glib/$j|glib.h| $i;
+ sed -i s|glib/$j|glib.h| $i
done
done
+%if 0%{?suse_version} 1230
+for i in `grep -Rl include.*gtkmm/ .`; do
+ sed -i 's|gtkmm/[^]*|gtkmm.h|' $i
+done
+%endif
rm -rf ext/ctemplate
+rm -rf ext/cppconn
%build
export SUSE_ASNEEDED=0
++ mysql-workbench-5.2.47-system-cppconn.patch ++
Index: configure.in
===
--- configure.in.orig
+++ configure.in
@@ -487,8 +487,6 @@ res/mysql.profiles/Makefile
res/sqlidedata/Makefile
ext/Makefile
ext/scintilla/gtk/Makefile
-ext/cppconn/Makefile
-ext/cppconn/driver/Makefile
ext/vsqlite++/Makefile
ext/vsqlite++/src/sqlite/Makefile
backend/Makefile
Index: ext/Makefile.am
===
--- ext/Makefile.am.orig
+++ ext/Makefile.am
@@ -3,7 +3,7 @@ if BUILD_ANTLR_RUNTIME
antlr_dirs=antlr-runtime
endif
-SUBDIRS=scintilla/gtk cppconn vsqlite++ $(antlr_dirs)
+SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs)
if BUNDLE_UTILITIES
all-am:
Index: ext/Makefile.in
===
--- ext/Makefile.in.orig
+++ ext/Makefile.in
@@ -53,7 +53,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = scintilla/gtk cppconn vsqlite++ antlr-runtime ctemplate
+DIST_SUBDIRS = scintilla/gtk vsqlite++ antlr-runtime ctemplate
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -223,7 +223,7 @@ top_srcdir = @top_srcdir@
unixodbc = @unixodbc@
@BUILD_CTEMPLATE_TRUE@ctemplate_dirs = ctemplate
@BUILD_ANTLR_RUNTIME_TRUE@antlr_dirs = antlr-runtime
-SUBDIRS = scintilla/gtk cppconn vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
+SUBDIRS = scintilla/gtk vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
all: all-recursive
.SUFFIXES:
Index: backend/wbprivate/sqlide/wb_sql_editor_form.cpp
===
--- backend/wbprivate/sqlide/wb_sql_editor_form.cpp.orig
+++ backend/wbprivate/sqlide/wb_sql_editor_form.cpp
@@ -49,7 +49,7 @@
// this doesn't belong here, but there's no other workaround for having access
to mysql_info
// because of that we also need to link wbprivate directly to the connector,
making their
// dynamic loading pretty much useless
-#include cppconn/../driver/mysql_connection.h
+#include mysql_connection.h
#include boost/foreach.hpp
#include boost/scoped_ptr.hpp
Index: backend/wbpublic/grtdb/diff_dbobjectmatch.cpp
===
--- backend/wbpublic/grtdb/diff_dbobjectmatch.cpp.orig
+++ backend/wbpublic/grtdb/diff_dbobjectmatch.cpp
@@ -22,7 +22,7 @@
// this doesn't belong here, but there's no other workaround for having access
to mysql_info
// because of that we also need to link wbprivate directly to the connector,
making their
// dynamic loading pretty much useless
-#include cppconn/../driver/mysql_connection.h
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2013-03-21 10:40:08
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2013-02-07 14:24:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2013-03-21 10:40:09.0 +0100
@@ -2 +2,13 @@
-Wed Fen 6 13:03:10 CEST 2013 - opens...@sukimashita.com
+Tue Mar 12 15:29:39 UTC 2013 - speili...@suse.com
+
+- Fix invalid changes entry
+
+---
+Wed Mar 6 19:18:39 UTC 2013 - h...@urpla.net
+
+- update to version 5.2.47
+ see
+ http://dev.mysql.com/doc/relnotes/workbench/en/wb-news-5-2-47.html
+
+---
+Wed Mar 6 13:03:10 UTC 2013 - opens...@sukimashita.com
@@ -26,0 +39,11 @@
+
+---
+Thu Nov 15 23:13:41 UTC 2012 - h...@urpla.net
+
+- build and static link included antlr3
+
+---
+Wed Nov 14 23:57:26 UTC 2012 - h...@urpla.net
+
+- update to version 5.2.44
+- rebase patches
Old:
mysql-workbench-gpl-5.2.46-src.tar.gz
New:
mysql-workbench-gpl-5.2.47-src.tar.bz2
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.AvFSXe/_old 2013-03-21 10:40:12.0 +0100
+++ /var/tmp/diff_new_pack.AvFSXe/_new 2013-03-21 10:40:12.0 +0100
@@ -20,10 +20,10 @@
Summary:A MySQL visual modeling tool
License:GPL-2.0+
Group: Productivity/Databases/Clients
-Version:5.2.46
+Version:5.2.47
Release:0
Url:http://dev.mysql.com/downloads/workbench
-Source: %{name}-gpl-%{version}-src.tar.gz
+Source: %{name}-gpl-%{version}-src.tar.bz2
Source1:openSUSE_(Vendor_Package).xml
Patch0: mysql-workbench-gpl-5.2.44-ctemplate-fix.patch
Patch1: mysql-workbench-gpl-5.2.44-avoid-version.patch
@@ -77,6 +77,7 @@
%endif
BuildRequires: cairo-devel = 1.5.12
BuildRequires: libctemplate-devel
+BuildRequires: libiodbc-devel
Requires(post):shared-mime-info
Requires(postun): shared-mime-info
Requires(post):desktop-file-utils
@@ -99,8 +100,8 @@
%prep
%setup -q -n %{name}-gpl-%{version}-src
-%patch0
-%patch1
+%patch0 -p1
+%patch1 -p1
for j in gpattern.h gmessages.h gthread.h gbase64.h gunicode.h gerror.h
gquark.h gtypes.h gmacros.h ; do
for i in `grep -Rl glib/$j .`; do
sed -i s|glib/$j|glib.h| $i;
@@ -185,6 +186,7 @@
%defattr(-,root,root)
%doc COPYING ChangeLog README.plugins README.modules
%{_bindir}/*
+/usr/lib/%{name}-bin
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*
%{_libexecdir}/%{name}-bin
++ mysql-workbench-gpl-5.2.44-avoid-version.patch ++
--- /var/tmp/diff_new_pack.AvFSXe/_old 2013-03-21 10:40:12.0 +0100
+++ /var/tmp/diff_new_pack.AvFSXe/_new 2013-03-21 10:40:12.0 +0100
@@ -1,30 +1,31 @@
-Index: ext/cppconn/driver/Makefile.am
+Index: b/ext/cppconn/driver/Makefile.am
===
ext/cppconn/driver/Makefile.am.orig
-+++ ext/cppconn/driver/Makefile.am
+--- a/ext/cppconn/driver/Makefile.am
b/ext/cppconn/driver/Makefile.am
@@ -28,4 +28,4 @@ mysqlcppconn_la_SOURCES=\
INCLUDES=-I.. @MYSQL_INCLUDE@ -I./nativeapi -DMYSQLCLIENT_STATIC_BINDING=1
-I../cppconn -I../..
-mysqlcppconn_la_LDFLAGS=-module @MYSQL_LIBS@
+mysqlcppconn_la_LDFLAGS=-avoid-version -module @MYSQL_LIBS@
-Index: library/forms/swig/Makefile.am
+Index: b/library/forms/swig/Makefile.am
===
library/forms/swig/Makefile.am.orig
-+++ library/forms/swig/Makefile.am
+--- a/library/forms/swig/Makefile.am
b/library/forms/swig/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES=@SIGC_CFLAGS@ @PYTHON_CFLAGS@ @
-I$(top_srcdir)/ext/scintilla/include\
-I$(top_srcdir)/backend/wbpublic/
-_mforms_la_LDFLAGS=-module
+-_cairo_la_LDFLAGS=-module
+_mforms_la_LDFLAGS=-avoid-version -module
- _cairo_la_LDFLAGS=-module
++_cairo_la_LDFLAGS=-avoid-version -module
-Index: modules/db.checks/Makefile.am
+Index: b/modules/db.checks/Makefile.am
===
modules/db.checks/Makefile.am.orig
-+++ modules/db.checks/Makefile.am
+--- a/modules/db.checks/Makefile.am
b/modules/db.checks/Makefile.am
@@ -14,7 +14,7 @@
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2013-02-07 14:24:55
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2012-12-05 14:00:50.0 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2013-02-07 14:24:58.0 +0100
@@ -1,0 +2,14 @@
+Wed Fen 6 13:03:10 CEST 2013 - opens...@sukimashita.com
+
+- update to version 5.2.46
+ see
+ http://dev.mysql.com/doc/relnotes/workbench/en/wb-news-5-2-46.html
+
+---
+Wed Jan 23 06:42:47 UTC 2013 - gan...@opensuse.org
+
+- update to version 5.2.45
+ see
+ http://dev.mysql.com/doc/relnotes/workbench/en/wb-news-5-2-45.html
+
+---
Old:
mysql-workbench-gpl-5.2.44-src.tar.gz
New:
mysql-workbench-gpl-5.2.46-src.tar.gz
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.ngkavx/_old 2013-02-07 14:25:01.0 +0100
+++ /var/tmp/diff_new_pack.ngkavx/_new 2013-02-07 14:25:01.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary:A MySQL visual modeling tool
License:GPL-2.0+
Group: Productivity/Databases/Clients
-Version:5.2.44
+Version:5.2.46
Release:0
Url:http://dev.mysql.com/downloads/workbench
Source: %{name}-gpl-%{version}-src.tar.gz
++ mysql-workbench-gpl-5.2.44-src.tar.gz -
mysql-workbench-gpl-5.2.46-src.tar.gz ++
/work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-gpl-5.2.44-src.tar.gz
/work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-gpl-5.2.46-src.tar.gz
differ: char 5, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2012-12-05 14:00:44
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2012-09-23 17:07:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2012-12-05 14:00:50.0 +0100
@@ -1,0 +2,13 @@
+Sat Nov 24 18:57:54 UTC 2012 - gan...@opensuse.org
+
+- update to version 5.2.44
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-44.html
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-43.html
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-42.html
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-41.html
+- Add build dependency on libiodbc
+- rebase patches
+- Don't blindly remove libs from %{_libdir}/%{name}/
+ Some of them is runtime dependencies
+
+---
Old:
mysql-workbench-gpl-5.2.40-avoid-version.patch
mysql-workbench-gpl-5.2.40-ctemplate-fix.patch
mysql-workbench-gpl-5.2.40-src.tar.gz
New:
mysql-workbench-gpl-5.2.44-avoid-version.patch
mysql-workbench-gpl-5.2.44-ctemplate-fix.patch
mysql-workbench-gpl-5.2.44-src.tar.gz
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.jTvGv6/_old 2012-12-05 14:00:53.0 +0100
+++ /var/tmp/diff_new_pack.jTvGv6/_new 2012-12-05 14:00:53.0 +0100
@@ -20,13 +20,13 @@
Summary:A MySQL visual modeling tool
License:GPL-2.0+
Group: Productivity/Databases/Clients
-Version:5.2.40
+Version:5.2.44
Release:0
Url:http://dev.mysql.com/downloads/workbench
Source: %{name}-gpl-%{version}-src.tar.gz
Source1:openSUSE_(Vendor_Package).xml
-Patch0: mysql-workbench-gpl-5.2.40-ctemplate-fix.patch
-Patch1: mysql-workbench-gpl-5.2.40-avoid-version.patch
+Patch0: mysql-workbench-gpl-5.2.44-ctemplate-fix.patch
+Patch1: mysql-workbench-gpl-5.2.44-avoid-version.patch
Summary:A MySQL visual modeling tool
Group: Productivity/Databases/Clients
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -57,6 +57,7 @@
BuildRequires: php-devel
BuildRequires: python-devel
BuildRequires: readline-devel
+BuildRequires: pkgconfig(libiodbc)
BuildRequires: pkgconfig(xxf86vm)
%if 0%{?suse_version}
BuildRequires: FastCGI-devel
@@ -133,7 +134,8 @@
cp plugins/README README.plugins
cp modules/README README.modules
rm -f %{buildroot}%{_libdir}/%{name}{,/modules,/plugins}/*.la
-rm -f %{buildroot}%{_libdir}/%{name}/lib*.so
+rm -f %{buildroot}%{_libdir}/%{name}/lib*[!w][!b].so
+rm -f %{buildroot}%{_libdir}/%{name}/lib*.a
install -D -m 0644 images/icons/MySQLWorkbench-48.png
%{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/%{name}/mysql.profiles
@@ -161,6 +163,11 @@
# When below tests fail, we can now remove the chmod
test ! -x %{buildroot}%{_datadir}/%{name}/sshtunnel.py
chmod +x %{buildroot}%{_datadir}/%{name}/sshtunnel.py
+test ! -x %{buildroot}%{_libdir}/%{name}/modules/explain_renderer.py
+chmod +x %{buildroot}%{_libdir}/%{name}/modules/explain_renderer.py
+test ! -x %{buildroot}%{_datadir}/%{name}/extras/build_freetds.sh
+chmod +x %{buildroot}%{_datadir}/%{name}/extras/build_freetds.sh
+
%fdupes -s $RPM_BUILD_ROOT
%post
@@ -180,6 +187,7 @@
%{_bindir}/*
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*
+%{_libexecdir}/%{name}-bin
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/applications/%{name}.desktop
++ mysql-workbench-gpl-5.2.40-avoid-version.patch -
mysql-workbench-gpl-5.2.44-avoid-version.patch ++
---
/work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-gpl-5.2.40-avoid-version.patch
2012-09-23 17:07:40.0 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-gpl-5.2.44-avoid-version.patch
2012-12-05 14:00:46.0 +0100
@@ -12,12 +12,13 @@
===
--- library/forms/swig/Makefile.am.orig
+++ library/forms/swig/Makefile.am
-@@ -14,6 +14,6 @@ INCLUDES=@SIGC_CFLAGS@ @PYTHON_CFLAGS@ @
- -I$(top_srcdir)/library/base\
+@@ -25,7 +25,7 @@ INCLUDES=@SIGC_CFLAGS@ @PYTHON_CFLAGS@ @
+ -I$(top_srcdir)/ext/scintilla/include\
-I$(top_srcdir)/backend/wbpublic/
-_mforms_la_LDFLAGS=-module
+_mforms_la_LDFLAGS=-avoid-version -module
+ _cairo_la_LDFLAGS=-module
Index: modules/db.checks/Makefile.am
@@ -47,7
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2012-09-23 17:07:38
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2012-04-17 07:46:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2012-09-23 17:07:40.0 +0200
@@ -1,0 +2,16 @@
+Tue Sep 18 14:40:15 UTC 2012 - idon...@suse.com
+
+- Add build dependency on xxf86vm to fix the build
+
+---
+Sun Jun 17 11:16:14 UTC 2012 - gan...@opensuse.org
+
+- update to version 5.2.40
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-40.html
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-39.html
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-38.html
+- add mime type support
+- use fdups
+- rebase patches
+
+---
Old:
mysql-workbench-gpl-5.2.34-ctemplate-fix.patch
mysql-workbench-gpl-5.2.36-avoid-version.patch
mysql-workbench-gpl-5.2.37-src.tar.bz2
New:
mysql-workbench-gpl-5.2.40-avoid-version.patch
mysql-workbench-gpl-5.2.40-ctemplate-fix.patch
mysql-workbench-gpl-5.2.40-src.tar.gz
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.dqWw23/_old 2012-09-23 17:07:44.0 +0200
+++ /var/tmp/diff_new_pack.dqWw23/_new 2012-09-23 17:07:44.0 +0200
@@ -16,18 +16,17 @@
#
-
Name: mysql-workbench
Summary:A MySQL visual modeling tool
License:GPL-2.0+
Group: Productivity/Databases/Clients
-Version:5.2.37
+Version:5.2.40
Release:0
Url:http://dev.mysql.com/downloads/workbench
-Source: %{name}-gpl-%{version}-src.tar.bz2
+Source: %{name}-gpl-%{version}-src.tar.gz
Source1:openSUSE_(Vendor_Package).xml
-Patch0: mysql-workbench-gpl-5.2.34-ctemplate-fix.patch
-Patch1: mysql-workbench-gpl-5.2.36-avoid-version.patch
+Patch0: mysql-workbench-gpl-5.2.40-ctemplate-fix.patch
+Patch1: mysql-workbench-gpl-5.2.40-avoid-version.patch
Summary:A MySQL visual modeling tool
Group: Productivity/Databases/Clients
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -58,6 +57,7 @@
BuildRequires: php-devel
BuildRequires: python-devel
BuildRequires: readline-devel
+BuildRequires: pkgconfig(xxf86vm)
%if 0%{?suse_version}
BuildRequires: FastCGI-devel
BuildRequires: libuuid-devel
@@ -76,14 +76,18 @@
%endif
BuildRequires: cairo-devel = 1.5.12
BuildRequires: libctemplate-devel
+Requires(post):shared-mime-info
+Requires(postun): shared-mime-info
+Requires(post):desktop-file-utils
+Requires(postun): desktop-file-utils
Requires: python-paramiko
Requires: python-pexpect
-Provides: mysql-administrator=%{version}
-Provides: mysql-gui-tools=%{version}
-Provides: mysql-querybrovser=%{version}
-Obsoletes: mysql-administrator%{version}
-Obsoletes: mysql-gui-tools%{version}
-Obsoletes: mysql-querybrovser%{version}
+Provides: mysql-administrator = %{version}
+Provides: mysql-gui-tools = %{version}
+Provides: mysql-querybrovser = %{version}
+Obsoletes: mysql-administrator %{version}
+Obsoletes: mysql-gui-tools %{version}
+Obsoletes: mysql-querybrovser %{version}
%description
MySQL Workbench provides DBAs and developers an integrated tools environment
@@ -132,12 +136,10 @@
rm -f %{buildroot}%{_libdir}/%{name}/lib*.so
install -D -m 0644 images/icons/MySQLWorkbench-48.png
%{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/%{name}/mysql.profiles
-rm -f $RPM_SOURCE_DIR/*.desktop
-sed -i 's/^Icon.*/Icon=%{name}.png/'
%{buildroot}%{_datadir}/applications/MySQLWorkbench.desktop
-sed -i 's/;$//' %{buildroot}%{_datadir}/applications/MySQLWorkbench.desktop
+
%if 0%{?suse_version}
mv %{buildroot}%{_datadir}/applications/MySQLWorkbench.desktop
$RPM_SOURCE_DIR/%{name}.desktop
-%suse_update_desktop_file -i -r -G Database GUI Tool %{name}
GTK;Development;Database;GUIDesigner;
+%suse_update_desktop_file -i -r -G Database GUI Tool %{name}
GTK;Development;Office;Database;GUIDesigner;
%fdupes -s %{_datadir}/%{name}/images
%else
mv %{buildroot}%{_datadir}/applications/MySQLWorkbench.desktop
%{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -145,6 +147,7 @@
for i in ChangeLog README.plugins README README.modules
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2012-04-17 07:46:56
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2012-02-17 12:18:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2012-04-17 07:46:58.0 +0200
@@ -1,0 +2,5 @@
+Mon Mar 19 06:34:27 UTC 2012 - br...@ioda-net.ch
+
+- Fix build by adding libuuid-devel
+
+---
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.YHSHZF/_old 2012-04-17 07:47:00.0 +0200
+++ /var/tmp/diff_new_pack.YHSHZF/_new 2012-04-17 07:47:00.0 +0200
@@ -16,6 +16,7 @@
#
+
Name: mysql-workbench
Summary:A MySQL visual modeling tool
License:GPL-2.0+
@@ -59,6 +60,7 @@
BuildRequires: readline-devel
%if 0%{?suse_version}
BuildRequires: FastCGI-devel
+BuildRequires: libuuid-devel
BuildRequires: sqlite3-devel
BuildRequires: update-desktop-files
%endif
@@ -72,14 +74,15 @@
BuildRequires: PolicyKit-gnome
%endif
%endif
-BuildRequires: libctemplate-devel
BuildRequires: cairo-devel = 1.5.12
-Requires: python-paramiko python-pexpect
-Provides: mysql-gui-tools=%{version}
+BuildRequires: libctemplate-devel
+Requires: python-paramiko
+Requires: python-pexpect
Provides: mysql-administrator=%{version}
+Provides: mysql-gui-tools=%{version}
Provides: mysql-querybrovser=%{version}
-Obsoletes: mysql-gui-tools%{version}
Obsoletes: mysql-administrator%{version}
+Obsoletes: mysql-gui-tools%{version}
Obsoletes: mysql-querybrovser%{version}
%description
@@ -118,7 +121,7 @@
# Doesn't exist anymore
# --enable-readline \
-#FIX this is too much on obs Out of Memory make %{?jobs:-j%jobs}
+#FIX this is too much on obs Out of Memory make %%{?jobs:-j%%jobs}
make %{?jobs:-j2}
%install
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2012-02-17 12:18:31
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2012-02-14 11:25:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2012-02-17 12:18:37.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 13 10:50:46 UTC 2012 - co...@suse.com
+
+- patch license to follow spdx.org standard
+
+---
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.YxBcCT/_old 2012-02-17 12:18:39.0 +0100
+++ /var/tmp/diff_new_pack.YxBcCT/_new 2012-02-17 12:18:39.0 +0100
@@ -16,13 +16,12 @@
#
-
Name: mysql-workbench
Summary:A MySQL visual modeling tool
+License:GPL-2.0+
+Group: Productivity/Databases/Clients
Version:5.2.37
Release:0
-Group: Productivity/Databases/Clients
-License:GPL-2.0+
Url:http://dev.mysql.com/downloads/workbench
Source: %{name}-gpl-%{version}-src.tar.bz2
Source1:openSUSE_(Vendor_Package).xml
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2012-02-14 11:25:14
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
Package is mysql-workbench, Maintainer is mhruse...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2011-09-23 02:14:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2012-02-14 11:25:17.0 +0100
@@ -1,0 +2,19 @@
+Mon Jan 30 14:11:37 UTC 2012 - mhruse...@suse.cz
+
+- update to version 5.2.37
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-37.html
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-36.html
+- fixed glib headers to include glib.h only
+
+---
+Sun Nov 27 06:42:18 UTC 2011 - co...@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+---
+Fri Sep 30 14:11:41 CEST 2011 - mhruse...@suse.cz
+
+- update to version 5.2.35
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-35.html
+
+---
Old:
mysql-workbench-gpl-5.2.34-avoid-version.patch
mysql-workbench-noext-oss-5.2.34.tar.bz2
New:
mysql-workbench-gpl-5.2.36-avoid-version.patch
mysql-workbench-gpl-5.2.37-src.tar.bz2
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.MQeRQL/_old 2012-02-14 11:25:20.0 +0100
+++ /var/tmp/diff_new_pack.MQeRQL/_new 2012-02-14 11:25:20.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mysql-workbench
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,36 +15,58 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: mysql-workbench
Summary:A MySQL visual modeling tool
-Version:5.2.34
-Release:1
+Version:5.2.37
+Release:0
Group: Productivity/Databases/Clients
-License:GPLv2+
+License:GPL-2.0+
Url:http://dev.mysql.com/downloads/workbench
-# Upstream tarball without ext directory (rm -rf ext)
-Source: %{name}-noext-oss-%{version}.tar.bz2
+Source: %{name}-gpl-%{version}-src.tar.bz2
Source1:openSUSE_(Vendor_Package).xml
Patch0: mysql-workbench-gpl-5.2.34-ctemplate-fix.patch
-Patch1: mysql-workbench-gpl-5.2.34-avoid-version.patch
+Patch1: mysql-workbench-gpl-5.2.36-avoid-version.patch
Summary:A MySQL visual modeling tool
Group: Productivity/Databases/Clients
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: boost-devel gcc-c++ lua-devel
-BuildRequires: glib2-devel libsigc++2-devel libxml2-devel
-BuildRequires: java-devel libgnome-devel mysql-devel
-BuildRequires: libzip-devel pcre-devel python-devel readline-devel
-BuildRequires: Mesa Mesa-devel cairomm-devel gtkmm24-devel
-BuildRequires: libglade2-devel libmysqlcppconn-devel php-devel
-BuildRequires: dos2unix fdupes
+BuildRequires: Mesa
+BuildRequires: Mesa-devel
+BuildRequires: boost-devel
+BuildRequires: cairomm-devel
+BuildRequires: dos2unix
+BuildRequires: fdupes
+BuildRequires: gcc-c++
+BuildRequires: glib2-devel
+BuildRequires: gtkmm24-devel
+BuildRequires: java-devel
+BuildRequires: libglade2-devel
+BuildRequires: libgnome-devel
+BuildRequires: libmysqlcppconn-devel
+BuildRequires: libsigc++2-devel
+BuildRequires: libtool
+BuildRequires: libxml2-devel
+BuildRequires: libzip-devel
+%if 0%{?suse_version} 1210
+BuildRequires: lua51-devel
+%else
+BuildRequires: lua-devel
+%endif
+BuildRequires: mysql-devel
+BuildRequires: pcre-devel
+BuildRequires: php-devel
+BuildRequires: python-devel
+BuildRequires: readline-devel
%if 0%{?suse_version}
-BuildRequires: FastCGI-devel sqlite3-devel update-desktop-files
+BuildRequires: FastCGI-devel
+BuildRequires: sqlite3-devel
+BuildRequires: update-desktop-files
%endif
%if 0%{?fedora}
-BuildRequires: fcgi-devel java-1.6.0-openjdk-devel sqlite-devel
+BuildRequires: fcgi-devel
+BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: sqlite-devel
%if 0%{?fedora} 11
BuildRequires: libuuid-devel
%else
@@ -71,7 +93,13 @@
%prep
%setup -q -n %{name}-gpl-%{version}-src
%patch0
-%patch1 -p1
+%patch1
+for j in gpattern.h gmessages.h
commit mysql-workbench for openSUSE:Factory
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at Mon Sep 19 21:24:53 CEST 2011.
--- mysql-workbench/mysql-workbench.changes 2010-12-20 16:42:30.0
+0100
+++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench.changes
2011-09-17 19:22:53.0 +0200
@@ -1,0 +2,20 @@
+Tue Sep 13 16:11:04 CEST 2011 - mhruse...@suse.cz
+
+- fixed openSUSE configuration
+
+---
+Sun Sep 11 08:03:58 CEST 2011 - mhruse...@suse.cz
+
+- readded patches
+- enabled command line utilities
+
+---
+Mon Sep 5 15:57:24 UTC 2011 - br...@ioda-net.ch
+
+- Upgraded to version 5.2.34
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-34.html
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-33.html
+ see http://dev.mysql.com/doc/workbench/en/wb-news-5-2-32.html
+- removed all patches
+
+---
calling whatdependson for head-i586
Old:
mysql-workbench-gpl-5.2.30-disable-bundled.patch
mysql-workbench-gpl-5.2.31-avoid-version.patch
mysql-workbench-noext-oss-5.2.31.tar.bz2
openSUSE_(MySQL_Package).xml
New:
mysql-workbench-gpl-5.2.34-avoid-version.patch
mysql-workbench-gpl-5.2.34-ctemplate-fix.patch
mysql-workbench-noext-oss-5.2.34.tar.bz2
openSUSE_(Vendor_Package).xml
Other differences:
--
++ mysql-workbench.spec ++
--- /var/tmp/diff_new_pack.440hER/_old 2011-09-19 21:24:46.0 +0200
+++ /var/tmp/diff_new_pack.440hER/_new 2011-09-19 21:24:46.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package mysql-workbench (Version 5.2.31)
+# spec file for package mysql-workbench
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,16 +20,16 @@
Name: mysql-workbench
Summary:A MySQL visual modeling tool
-Version:5.2.31
+Version:5.2.34
Release:1
Group: Productivity/Databases/Clients
License:GPLv2+
Url:http://dev.mysql.com/downloads/workbench
# Upstream tarball without ext directory (rm -rf ext)
Source: %{name}-noext-oss-%{version}.tar.bz2
-Source1:openSUSE_(MySQL_Package).xml
-Patch0: mysql-workbench-gpl-5.2.30-disable-bundled.patch
-Patch1: mysql-workbench-gpl-5.2.31-avoid-version.patch
+Source1:openSUSE_(Vendor_Package).xml
+Patch0: mysql-workbench-gpl-5.2.34-ctemplate-fix.patch
+Patch1: mysql-workbench-gpl-5.2.34-avoid-version.patch
Summary:A MySQL visual modeling tool
Group: Productivity/Databases/Clients
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -51,7 +51,7 @@
BuildRequires: PolicyKit-gnome
%endif
%endif
-BuildRequires: boost-devel libctemplate-devel
+BuildRequires: libctemplate-devel
BuildRequires: cairo-devel = 1.5.12
Requires: python-paramiko python-pexpect
Provides: mysql-gui-tools=%{version}
@@ -71,7 +71,7 @@
%prep
%setup -q -n %{name}-gpl-%{version}-src
%patch0
-%patch1
+%patch1 -p1
%build
export SUSE_ASNEEDED=0
@@ -87,14 +87,15 @@
--disable-static \
--with-gnu-ld \
--enable-grt-generation \
- --with-system-ctemplate
+ --enable-mysql-utilities
make %{?jobs:-j%jobs}
%install
make DESTDIR=%{buildroot} install
cp plugins/README README.plugins
cp modules/README README.modules
-rm -rf %{buildroot}%{_libdir}/%{name}{,/modules,/plugins}/*.la
+rm -f %{buildroot}%{_libdir}/%{name}{,/modules,/plugins}/*.la
+rm -f %{buildroot}%{_libdir}/%{name}/lib*.so
install -D -m 0644 images/icons/MySQLWorkbench-48.png
%{buildroot}%{_datadir}/pixmaps/%{name}.png
install -D -m 0644 %{S:1} %{buildroot}%{_datadir}/%{name}/mysql.profiles
rm -f $RPM_SOURCE_DIR/*.desktop
++ mysql-workbench-gpl-5.2.31-avoid-version.patch -
mysql-workbench-gpl-5.2.34-avoid-version.patch ++
--- mysql-workbench/mysql-workbench-gpl-5.2.31-avoid-version.patch
2010-12-10 01:32:04.0 +0100
+++
/mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-gpl-5.2.34-avoid-version.patch
2011-09-11 15:57:01.0 +0200
@@ -1,214 +1,249 @@
-Index: modules/db.checks/Makefile.am
+Index: mysql-workbench-gpl-5.2.34-src/ext/cppconn/driver/Makefile.am
===
modules/db.checks/Makefile.am.orig
-+++ modules/db.checks/Makefile.am
+--- mysql-workbench-gpl-5.2.34-src.orig/ext/cppconn/driver/Makefile.am
mysql-workbench-gpl-5.2.34-src/ext/cppconn/driver/Makefile.am
+@@ -28,4 +28,4 @@ mysqlcppconn_la_SOURCES=\
+
+
