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 "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes 2012-09-23 17:07:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2012-12-05 14:00:50.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Nov 24 18:57:54 UTC 2012 - [email protected] + +- 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.000000000 +0100 +++ /var/tmp/diff_new_pack.jTvGv6/_new 2012-12-05 14:00:53.000000000 +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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-gpl-5.2.44-avoid-version.patch 2012-12-05 14:00:46.000000000 +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 +48,7 @@ =================================================================== --- modules/db.mysql.sqlide/Makefile.am.orig +++ modules/db.mysql.sqlide/Makefile.am -@@ -22,7 +22,7 @@ INCLUDES=\ +@@ -23,7 +23,7 @@ INCLUDES=\ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @@ -73,7 +74,7 @@ =================================================================== --- modules/db.mysql/Makefile.am.orig +++ modules/db.mysql/Makefile.am -@@ -32,7 +32,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t +@@ -34,7 +34,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t # db_mysql_statement_parser_fe.cpp # @@ -97,18 +98,18 @@ =================================================================== --- modules/grt.forms/Makefile.am.orig +++ modules/grt.forms/Makefile.am -@@ -11,5 +11,5 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t +@@ -12,5 +12,5 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t forms_grt_la_SOURCES=src/grt_forms.cpp -forms_grt_la_LDFLAGS=-module +forms_grt_la_LDFLAGS=-avoid-version -module - + forms_grt_la_LIBADD=../../ext/scintilla/gtk/libwbscintilla.la Index: modules/wb.model/Makefile.am =================================================================== --- modules/wb.model/Makefile.am.orig +++ modules/wb.model/Makefile.am -@@ -72,7 +72,7 @@ INCLUDES=-I$(top_srcdir)/generated\ +@@ -73,7 +73,7 @@ INCLUDES=-I$(top_srcdir)/generated\ @CTEMPLATE_CFLAGS@ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @@ -160,13 +161,13 @@ =================================================================== --- plugins/db.mysql.diff.reporting/frontend/Makefile.am.orig +++ plugins/db.mysql.diff.reporting/frontend/Makefile.am -@@ -22,7 +22,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t +@@ -23,7 +23,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @PCRE_CFLAGS@ -db_mysql_diff_reporting_wbp_la_LDFLAGS=-module +db_mysql_diff_reporting_wbp_la_LDFLAGS=-module -avoid-version - db_mysql_diff_reporting_wbp_la_LIBADD=$(top_srcdir)/library/grt/src/libgrt.la $(top_srcdir)/library/forms/libmforms.la @GLIB_LIBS@ + db_mysql_diff_reporting_wbp_la_LIBADD=$(top_srcdir)/library/grt/src/libgrt.la $(top_srcdir)/library/forms/libmforms.la $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la @GLIB_LIBS@ Index: plugins/db.mysql.editors/linux/Makefile.am @@ -225,15 +226,15 @@ =================================================================== --- plugins/wb.model.snippets/Makefile.am.orig +++ plugins/wb.model.snippets/Makefile.am -@@ -22,7 +22,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t +@@ -23,7 +23,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ -wb_model_snippets_wbp_la_LDFLAGS=-module +wb_model_snippets_wbp_la_LDFLAGS=-avoid-version -module - wb_model_snippets_wbp_la_SOURCES=\ - include_model_wizard.cpp\ + wb_model_snippets_wbp_la_LIBADD=$(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la + Index: plugins/wb.printing/linux/Makefile.am =================================================================== --- plugins/wb.printing/linux/Makefile.am.orig ++++++ mysql-workbench-gpl-5.2.40-ctemplate-fix.patch -> mysql-workbench-gpl-5.2.44-ctemplate-fix.patch ++++++ --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-gpl-5.2.40-ctemplate-fix.patch 2012-09-23 17:07:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-gpl-5.2.44-ctemplate-fix.patch 2012-12-05 14:00:46.000000000 +0100 @@ -2,28 +2,31 @@ =================================================================== --- configure.in.orig +++ configure.in -@@ -342,7 +342,7 @@ AC_SUBST(CTEMPLATE_LIBS) - #AM_CONDITIONAL(BUILD_PHP, test "x$enable_php" = "xyes") +@@ -398,7 +398,7 @@ fi + + AM_CONDITIONAL(USE_READLINE, test "x$use_readline" = "xyes") - #AM_CONDITIONAL(BUILD_FASTCGI, test "x$enable_cgi" = "xyes") --AM_CONDITIONAL(BUILD_CTEMPLATE, test "x$ac_system_ctemplate" = "xyes") +-AM_CONDITIONAL(BUILD_CTEMPLATE, test "x$ac_system_ctemplate" != "xyes") +AM_CONDITIONAL(BUILD_CTEMPLATE, test "x$ac_system_ctemplate" \!= "xyes") AM_CONDITIONAL(BUILD_SE, test "x$std_edition" = "xyes") AM_CONDITIONAL(BUNDLE_UTILITIES, test "x$bundle_utilities" = "xyes") - + AM_CONDITIONAL(BUILD_ANTLR_RUNTIME, test "x$ac_system_antlr_runtime" != "xyes") Index: ext/Makefile.am =================================================================== --- ext/Makefile.am.orig +++ ext/Makefile.am -@@ -1,10 +1,5 @@ +@@ -1,13 +1,9 @@ -if BUILD_CTEMPLATE --else -ctemplate_dirs=ctemplate -endif - --SUBDIRS=scintilla/gtk cppconn vsqlite++ $(ctemplate_dirs) -+SUBDIRS=scintilla/gtk cppconn vsqlite++ + if BUILD_ANTLR_RUNTIME + antlr_dirs=antlr-runtime + endif + +-SUBDIRS=scintilla/gtk cppconn vsqlite++ $(antlr_dirs) $(ctemplate_dirs) ++SUBDIRS=scintilla/gtk cppconn vsqlite++ $(antlr_dirs) if BUNDLE_UTILITIES all-am: ++++++ mysql-workbench-gpl-5.2.40-src.tar.gz -> mysql-workbench-gpl-5.2.44-src.tar.gz ++++++ /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-gpl-5.2.40-src.tar.gz /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-gpl-5.2.44-src.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
