[packages/mysql-workbench] build with system antlr3c

[glen]

commit 9371f54f5b1959453409954dace9b4ef827a44fa
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Oct 5 01:08:07 2012 +0300

    build with system antlr3c

 mysql-workbench.spec |  4 ++++
 system-antlr.patch   | 11 +++++++++++
 2 files changed, 15 insertions(+)
---
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index a9ba0e0..0d2e182 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -16,6 +16,7 @@ Source1:	PLD_Linux_(MySQL_Package).xml
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-python_libs.patch
 Patch2:		%{name}-posix.patch
+Patch3:		system-antlr.patch
 Patch5:		pld-profile.patch
 Patch6:		get_local_ip_list.patch
 Patch7:		log_slow_queries.patch
@@ -33,6 +34,7 @@ BuildRequires:	ctemplate-devel
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gtkmm-devel >= 2.12
+BuildRequires:	libantlr3c-devel >= 3.4
 BuildRequires:	libglade2-devel
 #BuildRequires:	libgnome-devel >= 2.0
 BuildRequires:	libgnome-keyring-devel
@@ -84,12 +86,14 @@ skomplikowanych migracji do MySQL-a.
 %setup -q -n %{name}-gpl-%{version}-src
 %undos MySQLWorkbench.desktop.in
 # we use System provided libraries
+rm -r ext/antlr-runtime
 rm -r ext/cppconn
 rm -r ext/python/pexpect
 #rm -r ext/tinyxml
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
diff --git a/system-antlr.patch b/system-antlr.patch
new file mode 100644
index 0000000..0db40e9
--- /dev/null
+++ b/system-antlr.patch
@@ -0,0 +1,11 @@
+--- mysql-workbench-gpl-5.2.44-src/ext/Makefile.am~	2012-09-26 23:50:42.000000000 +0300
++++ mysql-workbench-gpl-5.2.44-src/ext/Makefile.am	2012-10-04 23:12:21.247796323 +0300
+@@ -4,7 +4,7 @@
+ endif
+ 
+ if BUILD_ANTLR_RUNTIME
+-antlr_dirs=antlr-runtime
++antlr_dirs=
+ endif
+ 
+ SUBDIRS=scintilla/gtk cppconn vsqlite++ $(antlr_dirs) $(ctemplate_dirs)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql-workbench.git/commitdiff/b2dd4e3f7164b7dd777f447eb8cbff81c716d445