Author: arvenil Date: Tue May 18 00:27:08 2010 GMT Module: packages Tag: DEVEL ---- Log message: - up to 5.2.21
---- Files affected: packages/mysql-workbench: mysql-workbench.spec (1.12 -> 1.12.2.1) , mysql-workbench-build.patch (1.1 -> 1.1.2.1) ---- Diffs: ================================================================ Index: packages/mysql-workbench/mysql-workbench.spec diff -u packages/mysql-workbench/mysql-workbench.spec:1.12 packages/mysql-workbench/mysql-workbench.spec:1.12.2.1 --- packages/mysql-workbench/mysql-workbench.spec:1.12 Sun Apr 11 17:28:05 2010 +++ packages/mysql-workbench/mysql-workbench.spec Tue May 18 02:27:02 2010 @@ -11,12 +11,12 @@ Summary: Extensible modeling tool for MySQL Summary(pl.UTF-8): Narzędzie do modelowania baz danych dla MySQL-a Name: mysql-workbench -Version: 5.1.18 -Release: 1 +Version: 5.2.21 +Release: 0.1 License: GPL v2 Group: Applications/Databases Source0: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-oss-%{version}.tar.gz -# Source0-md5: f136bac3e808cadda36321ac0e644399 +# Source0-md5: 460fd6f5faee3ef800a2aa2076c22535 Patch0: %{name}-desktop.patch Patch1: %{name}-build.patch URL: http://wb.mysql.com/ @@ -38,7 +38,8 @@ BuildRequires: mysql-devel BuildRequires: pkgconfig BuildRequires: readline-devel -BuildRequires: unzip +Requires: python-paramiko +Requires: python-pexpect BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # FIXME: fix linking of m/usr/lib{,64}/mysql-workbench/plugins/*.so* modules and then drop this @@ -59,6 +60,7 @@ %setup -q -n %{name}-oss-%{version} %undos MySQLWorkbench.desktop.in rm -rf ext/boost +rm -rf ext/ctemplate %patch0 -p1 %patch1 -p1 @@ -71,6 +73,7 @@ %{__automake} %configure \ --enable-readline \ + --with-system-ctemplate \ CFLAGS="%{rpmcflags} -Wno-deprecated" \ LUA_LIBS="`pkg-config --libs lua51`" \ LUA_CFLAGS="`pkg-config --cflags lua51`" @@ -96,7 +99,6 @@ %doc ChangeLog README %attr(755,root,root) %{_bindir}/%{name} %attr(755,root,root) %{_bindir}/%{name}-bin -%attr(755,root,root) %{_bindir}/grtshell %{_datadir}/%{name} %{_libdir}/%{name} %{_desktopdir}/%{name}.desktop @@ -108,6 +110,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12.2.1 2010/05/18 00:27:02 arvenil +- up to 5.2.21 + Revision 1.12 2010/04/11 15:28:05 arvenil - up to 5.1.18 ================================================================ Index: packages/mysql-workbench/mysql-workbench-build.patch diff -u packages/mysql-workbench/mysql-workbench-build.patch:1.1 packages/mysql-workbench/mysql-workbench-build.patch:1.1.2.1 --- packages/mysql-workbench/mysql-workbench-build.patch:1.1 Thu Apr 8 14:02:28 2010 +++ packages/mysql-workbench/mysql-workbench-build.patch Tue May 18 02:27:02 2010 @@ -1,10 +1,29 @@ ---- mysql-workbench-oss-5.1.17/library/grt/src/Makefile.am~ 2009-08-14 01:09:21.000000000 +0200 -+++ mysql-workbench-oss-5.1.17/library/grt/src/Makefile.am 2010-04-08 13:49:58.694826677 +0200 -@@ -13,6 +13,7 @@ - @GRT_CFLAGS@ +--- mysql-workbench-oss-5.2.21/ext/Makefile.am 2010-05-11 13:50:49.000000000 +0000 ++++ mysql-workbench-oss-5.2.21/ext/Makefile.am 2010-05-16 22:47:10.000000000 +0000 +@@ -1 +1 @@ +-SUBDIRS=ctemplate scintilla/gtk cppconn ++SUBDIRS=scintilla/gtk cppconn +--- mysql-workbench-oss-5.2.21/configure.in 2010-05-11 13:51:04.000000000 +0000 ++++ mysql-workbench-oss-5.2.21/configure.in 2010-05-16 23:05:44.000000000 +0000 +@@ -524,10 +524,3 @@ - libgrt_la_LIBADD=\ -+ @glib_l...@\ - @lua_l...@\ - $(top_srcdir)/library/utilities/src/libguiutil.la + AC_OUTPUT() +- +-( +- cd ./ext/ctemplate/ctemplate-src && +- autoreconf -i -s; +- ./configure --prefix=$prefix --libdir=$libdir/mysql-workbench --disable-dependency-tracking --disable-dynamic +-) +- +--- mysql-workbench-oss-5.2.21/backend/wbprivate/model/canvas_floater.cpp 2010-05-11 13:50:45.000000000 +0000 ++++ mysql-workbench-oss-5.2.21/backend/wbprivate/model/canvas_floater.cpp 2010-05-17 00:10:59.000000000 +0000 +@@ -62,7 +62,7 @@ + _title->set_padding(6, 6); + _title->set_font(mdc::FontSpec("helvetica", mdc::SNormal, mdc::WBold)); + _title->set_color(mdc::Color::Black()); +- _title->set_text_color(mdc::Color::Color(0.7, 0.7, 0.7)); ++ _title->set_text_color(mdc::Color(0.7, 0.7, 0.7)); + _title->set_rounded(mdc::CTop); + add(_title, false, false); + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench.spec?r1=1.12&r2=1.12.2.1&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench-build.patch?r1=1.1&r2=1.1.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
