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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2015-06-24 20:57:09.000000000 +0200 @@ -1,0 +2,27 @@ +Wed Jun 23 10:00:01 UTC 2015 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.1z4krx/_new 2015-06-24 20:57:10.000000000 +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 [email protected] Patch4: mysql-workbench-cmake-3.2.patch -# PATCH-FIX-UPSTREAM mysql-workbench-glib.patch http://bugs.mysql.com/74147, boo#904767 [email protected] -- 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 %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf +chmod 644 %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf # workaround for prob with libantlr3c not being detected as being provided by pkg in fedora chmod +x %{buildroot}%{_libdir}/%{name}/*.so -%fdupes -s %{buildroot}/%{_datadir}/%{name} +%fdupes -s %{buildroot}%{_datadir}/%{name} # Check for duplicate files %fdupes -s %{buildroot}%{_prefix} @@ -229,6 +226,7 @@ %attr(0755,root,root) %{_bindir}/mysql* %attr(0755,root,root) %{_bindir}/wbcopytables %attr(0755,root,root) %{_libdir}/%{name}/%{name}-bin +%attr(0755,root,root) %{_libdir}/%{name}/wbcopytables-bin %dir %{_libdir}/%{name} %{_libdir}/%{name}/lib* ++++++ mysql-workbench-cmake-3.2.patch ++++++ --- /var/tmp/diff_new_pack.1z4krx/_old 2015-06-24 20:57:11.000000000 +0200 +++ /var/tmp/diff_new_pack.1z4krx/_new 2015-06-24 20:57:11.000000000 +0200 @@ -1,7 +1,7 @@ -Index: mysql-workbench-community-6.2.3-src/CMakeLists.txt +Index: mysql-workbench-community-6.3.4-src/CMakeLists.txt =================================================================== ---- mysql-workbench-community-6.2.3-src.orig/CMakeLists.txt -+++ mysql-workbench-community-6.2.3-src/CMakeLists.txt +--- mysql-workbench-community-6.3.4-src.orig/CMakeLists.txt ++++ mysql-workbench-community-6.3.4-src/CMakeLists.txt @@ -77,6 +77,7 @@ endif() find_package(LibXml2 REQUIRED) @@ -10,23 +10,23 @@ find_package(CTemplate) find_package(MySQLCppConn REQUIRED) -Index: mysql-workbench-community-6.2.3-src/frontend/linux/workbench/CMakeLists.txt +Index: mysql-workbench-community-6.3.4-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 +--- mysql-workbench-community-6.3.4-src.orig/frontend/linux/workbench/CMakeLists.txt ++++ mysql-workbench-community-6.3.4-src/frontend/linux/workbench/CMakeLists.txt @@ -50,6 +50,7 @@ include_directories(. - ${LIBZIP_INCLUDE_DIRS} ${MYSQLCPPCONN_INCLUDE_DIRS} ${GRT_INCLUDE_DIRS} + ${GNOME_KEYRING_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} +@@ -103,6 +104,7 @@ target_link_libraries(mysql-workbench-bi ${MYSQL_LIBRARIES} ${SQLITE3_LIBRARIES} + ${GNOME_KEYRING_LIBRARIES} + ${X11_LIBRARIES} ) - + install(TARGETS mysql-workbench-bin DESTINATION ${WB_INSTALL_DIR_EXECUTABLE}) ++++++ mysql-workbench-community-6.3.3-src-mysql_options4.patch ++++++ diff -Ppru mysql-workbench-community-6.3.3-src.orig/plugins/migration/copytable/copytable.cpp mysql-workbench-community-6.3.3-src/plugins/migration/copytable/copytable.cpp --- mysql-workbench-community-6.3.3-src.orig/plugins/migration/copytable/copytable.cpp 2015-04-15 15:54:19.000000000 +0200 +++ mysql-workbench-community-6.3.3-src/plugins/migration/copytable/copytable.cpp 2015-06-03 15:36:30.133573631 +0200 @@ -1920,12 +1920,17 @@ MySQLCopyDataTarget::MySQLCopyDataTarget _incoming_data_charset = "latin1"; mysql_init(&_mysql); + /* This is optional has compiled in for MySQL >= 5.6.6 + * Looks like MariaDB does not support this as supposed, + * so disable completly. */ +#if 0 #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) #if MYSQL_CHECK_VERSION(5,6,6) if (is_mysql_version_at_least(5,6,6)) mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); #endif #endif +#endif // _bulk_insert_record is used to prepare a single record string, the connection // is needed to escape binary data properly @@ -2872,7 +2877,7 @@ bool MySQLCopyDataTarget::InsertBuffer:: // This is needed because the escaping depends on the character set in use by the server #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) - #if MYSQL_CHECK_VERSION(5,7,6) + #if MYSQL_CHECK_VERSION(5,7,6) && not defined(MARIADB_BASE_VERSION) if (is_mysql_version_at_least(5,7,6)) length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength); else length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); ++++++ mysql-workbench-community-6.2.3-src.tar.gz -> mysql-workbench-community-6.3.4-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-community-6.2.3-src.tar.gz /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-community-6.3.4-src.tar.gz differ: char 5, line 1 ++++++ openSUSE_(Vendor_Package).xml ++++++ --- /var/tmp/diff_new_pack.1z4krx/_old 2015-06-24 20:57:11.000000000 +0200 +++ /var/tmp/diff_new_pack.1z4krx/_new 2015-06-24 20:57:11.000000000 +0200 @@ -1,10 +1,8 @@ <?xml version="1.0"?> - <data> <value type="dict"> <value type="string" key="sys.config.path">/etc/my.cnf</value> <value type="string" key="sys.config.section">mysqld</value> - <value type="string" key="sys.mysqld.start">/usr/sbin/rcmysql start</value> <value type="string" key="sys.mysqld.stop">/usr/sbin/rcmysql stop</value> <value type="string" key="sys.mysqld.status">/usr/sbin/rcmysql status | grep running</value> @@ -14,4 +12,3 @@ <value type="string" key="sys.system">Linux</value> </value> </data> -
