packages: mysql-workbench/mysql-workbench.spec - merge changes from DEVEL -...

[arvenil]

Author: arvenil                      Date: Fri Jul  2 07:49:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge changes from DEVEL
- release 1

---- Files affected:
packages/mysql-workbench:
   mysql-workbench.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/mysql-workbench/mysql-workbench.spec
diff -u packages/mysql-workbench/mysql-workbench.spec:1.17 packages/mysql-workbench/mysql-workbench.spec:1.18
--- packages/mysql-workbench/mysql-workbench.spec:1.17	Sun Jun  6 23:33:17 2010
+++ packages/mysql-workbench/mysql-workbench.spec	Fri Jul  2 09:49:02 2010
@@ -1,24 +1,16 @@
 # $Revision$, $Date$
-# TODO:
-# - something wrong after start:
-#   ** Message: WARNING: Could not open module /usr/lib64/mysql-workbench/modules/wb.mysql.import.grt.so (/usr/lib64/mysql-workbench/modules/wb.mysql.import.grt.so: undefined symbol: _ZN19Mysql_sql_parser_feC1Ev)
-#   ** Message: WARNING: Could not load wb.mysql.import.grt.so: Cannot open /usr/lib64/mysql-workbench/modules/wb.mysql.import.grt.so
-# - runs but not tested at all
-# - what with mysql-workbench from mysql-gui-tools.spec?
-# - doesn't build, -Wl,--as-needed problem,
-#   with %%define filterout_ld -Wl,--as-needed builds fine
-
 Summary:	Extensible modeling tool for MySQL
 Summary(pl.UTF-8):	Narzędzie do modelowania baz danych dla MySQL-a
 Name:		mysql-workbench
-Version:	5.2.21
-Release:	2
+Version:	5.2.25
+Release:	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:	460fd6f5faee3ef800a2aa2076c22535
+Source0:	ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/%{name}-gpl-%{version}.tar.gz
+# Source0-md5:	b4b6632f3f7e150fcbdd3ef06e1dda58
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-build.patch
+Patch1:		%{name}-python_libs.patch
+Patch2:		%{name}-replace_gnome_url_show_by_xdg-open.patch
 URL:		http://wb.mysql.com/
 BuildRequires:	OpenGL-devel
 BuildRequires:	autoconf
@@ -41,13 +33,20 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 BuildRequires:	readline-devel
+BuildRequires:	rpmbuild(macros) >= 1.566
 BuildRequires:	sqlite3-devel
-BuildRequires:	unzip
 Requires:	python-paramiko
+Requires:	python-pexpect
+Requires:	python-sqlite
+# Patch2 requires xdg-utils
+Requires:	xdg-utils
+Suggests:	gnome-keyring
+Suggests:	sudo
+Obsoletes:	mysql-administrator
+Obsoletes:	mysql-gui-tools
+Obsoletes:	mysql-query-browser
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		filterout_ld	-Wl,--as-needed
-
 %description
 MySQL Workbench is a database modeling tool for MySQL. You can use it
 to design and create new database schemas, document existing databases
@@ -60,11 +59,12 @@
 skomplikowanych migracji do MySQL-a.
 
 %prep
-%setup -q -n %{name}-oss-%{version}
+%setup -q -n %{name}-gpl-%{version}
 %undos MySQLWorkbench.desktop.in
 rm -rf ext/boost
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__glib_gettextize}
@@ -111,6 +111,52 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/07/02 07:49:02  arvenil
+- merge changes from DEVEL
+- release 1
+
+Revision 1.12.2.12  2010/07/01 16:27:07  arvenil
+- up to 5.2.25
+
+Revision 1.12.2.11  2010/06/26 14:39:47  arvenil
+- added patch which replaces gnome_url_show() by xdg-open
+- R: xdg-utils
+- release 0.2
+
+Revision 1.12.2.10  2010/06/22 00:27:43  arvenil
+- up to 5.2.24
+- droped patch for external_ctemplate; it's detected automatically now
+
+Revision 1.12.2.9  2010/06/08 23:48:17  arvenil
+- drop as-needed patch
+
+Revision 1.12.2.8  2010/06/08 20:16:13  arvenil
+- S: gnome-keyring
+
+Revision 1.12.2.7  2010/06/05 14:37:08  arvenil
+- S: sudo (for server administration)
+
+Revision 1.12.2.6  2010/06/05 11:15:08  arvenil
+- R: python-sqlite
+
+Revision 1.12.2.5  2010/06/05 10:48:42  arvenil
+- O: mysql-{administrator,gui-tools,query-browser}
+
+Revision 1.12.2.4  2010/06/05 09:28:19  arvenil
+- rename -build.patch -> -external_ctemplate.patch
+- added -as_needed.patch
+- added -python_libs.patch
+
+Revision 1.12.2.3  2010/06/03 10:36:46  glen
+- deps for fixed undos macro
+
+Revision 1.12.2.2  2010/06/03 08:23:24  arvenil
+- up to 5.2.22 RC 2
+- broken undos macro
+
+Revision 1.12.2.1  2010/05/18 00:27:02  arvenil
+- up to 5.2.21
+
 Revision 1.17  2010/06/06 21:33:17  sparky
 - BR: gettext-devel, libgnome-keyring-devel, python-devel, sqlite3-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-workbench/mysql-workbench.spec?r1=1.17&r2=1.18&f=u