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.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2012-09-23 17:07:40.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.dqWw23/_new 2012-09-23 17:07:44.000000000 +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 COPYING; do dos2unix $i done +rm -f %{buildroot}%{_datadir}/mime-info/%{name}.mime rm -f "%{buildroot}%{_datadir}"/doc/%{name}/{COPYING,README} rmdir --ignore-fail-on-non-empty "%{buildroot}%{_datadir}"/doc/%{name} cd "%{buildroot}%{_libdir}/%{name}" @@ -155,6 +158,18 @@ done cd .. done +# When below tests fail, we can now remove the chmod +test ! -x %{buildroot}%{_datadir}/%{name}/sshtunnel.py +chmod +x %{buildroot}%{_datadir}/%{name}/sshtunnel.py +%fdupes -s $RPM_BUILD_ROOT + +%post +%mime_database_post +%desktop_database_post + +%postun +%mime_database_postun +%desktop_database_postun %clean rm -rf %{buildroot} @@ -169,5 +184,9 @@ %{_datadir}/%{name}/* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/mimetypes/application-vnd.%{name}-model.png +%{_datadir}/icons/hicolor/*/mimetypes/application-vnd.%{name}-plugin.png +%{_datadir}/mime/packages/%{name}.xml %changelog ++++++ mysql-workbench-gpl-5.2.36-avoid-version.patch -> mysql-workbench-gpl-5.2.40-avoid-version.patch ++++++ --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-gpl-5.2.36-avoid-version.patch 2012-02-14 11:25:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-gpl-5.2.40-avoid-version.patch 2012-09-23 17:07:40.000000000 +0200 @@ -26,7 +26,7 @@ +++ modules/db.checks/Makefile.am @@ -14,7 +14,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t -I$(top_srcdir)/modules/db.mysql/src\ - @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ + @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @PCRE_CFLAGS@ -db_checks_wbp_la_LDFLAGS=-module +db_checks_wbp_la_LDFLAGS=-avoid-version -module @@ -108,8 +108,8 @@ =================================================================== --- modules/wb.model/Makefile.am.orig +++ modules/wb.model/Makefile.am -@@ -73,7 +73,7 @@ INCLUDES=-I$(top_srcdir)/generated\ - @CTEMPLATE_CFLAGS@ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ +@@ -72,7 +72,7 @@ INCLUDES=-I$(top_srcdir)/generated\ + @CTEMPLATE_CFLAGS@ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ -wb_model_grt_la_LDFLAGS=-module @@ -135,7 +135,7 @@ --- modules/wb.mysql.validation/Makefile.am.orig +++ modules/wb.mysql.validation/Makefile.am @@ -20,7 +20,7 @@ INCLUDES=-I$(top_srcdir)/generated\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ + @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ -wb_mysql_validation_grt_la_LDFLAGS=-module @@ -161,7 +161,7 @@ --- 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 - @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ + @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @PCRE_CFLAGS@ -db_mysql_diff_reporting_wbp_la_LDFLAGS=-module @@ -187,7 +187,7 @@ --- plugins/db.mysql/frontend/Makefile.am.orig +++ plugins/db.mysql/frontend/Makefile.am @@ -25,7 +25,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t - @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ + @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @PCRE_CFLAGS@ -db_mysql_wbp_la_LDFLAGS=-module @@ -213,7 +213,7 @@ --- plugins/wb.model.reporting/frontend/Makefile.am.orig +++ plugins/wb.model.reporting/frontend/Makefile.am @@ -17,7 +17,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t - @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ + @GRT_CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ @PCRE_CFLAGS@ -wb_model_reporting_wbp_la_LDFLAGS=-module ++++++ mysql-workbench-gpl-5.2.34-ctemplate-fix.patch -> mysql-workbench-gpl-5.2.40-ctemplate-fix.patch ++++++ --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench-gpl-5.2.34-ctemplate-fix.patch 2011-09-23 02:14:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench-gpl-5.2.40-ctemplate-fix.patch 2012-09-23 17:07:40.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- configure.in.orig +++ configure.in -@@ -319,7 +319,7 @@ AC_SUBST(CTEMPLATE_LIBS) +@@ -342,7 +342,7 @@ AC_SUBST(CTEMPLATE_LIBS) #AM_CONDITIONAL(BUILD_PHP, test "x$enable_php" = "xyes") AM_CONDITIONAL(USE_READLINE, test "x$use_readline" = "xyes") #AM_CONDITIONAL(BUILD_FASTCGI, test "x$enable_cgi" = "xyes") -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
