[mysql-workbench/f17] update to 5.2.44
Remi Collet
remi at fedoraproject.org
Sat Oct 20 09:23:43 UTC 2012
commit ae669aadb06db10c4fb8b697d3fcbec68a90b8c7
Author: Remi Collet <remi at fedoraproject.org>
Date: Sat Oct 20 09:26:17 2012 +0200
update to 5.2.44
.gitignore | 1 +
mysql-workbench-5.2.44-antlr.patch | 13 +++++++++++++
mysql-workbench-5.2.44-vsqlite.patch | 22 ++++++++++++++++++++++
mysql-workbench.spec | 22 +++++++++++++++++++++-
sources | 2 +-
5 files changed, 58 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 026b326..24f60a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/mysql-workbench-nodocs-5.2.41.tar.xz
/mysql-workbench-nodocs-5.2.42.tar.xz
/mysql-workbench-nodocs-5.2.43.tar.xz
+/mysql-workbench-nodocs-5.2.44.tar.xz
diff --git a/mysql-workbench-5.2.44-antlr.patch b/mysql-workbench-5.2.44-antlr.patch
new file mode 100644
index 0000000..3840475
--- /dev/null
+++ b/mysql-workbench-5.2.44-antlr.patch
@@ -0,0 +1,13 @@
+--- mysql-workbench-gpl-5.2.44-src/ext/Makefile.am.antlr 2012-10-20 08:35:10.000000000 +0200
++++ mysql-workbench-gpl-5.2.44-src/ext/Makefile.am 2012-10-20 08:35:48.447823166 +0200
+@@ -1,9 +1,5 @@
+
+-if BUILD_ANTLR_RUNTIME
+-antlr_dirs=antlr-runtime
+-endif
+-
+-SUBDIRS=scintilla/gtk $(antlr_dirs)
++SUBDIRS=scintilla/gtk
+
+ if BUNDLE_UTILITIES
+ all-am:
diff --git a/mysql-workbench-5.2.44-vsqlite.patch b/mysql-workbench-5.2.44-vsqlite.patch
new file mode 100644
index 0000000..bd98da0
--- /dev/null
+++ b/mysql-workbench-5.2.44-vsqlite.patch
@@ -0,0 +1,22 @@
+--- mysql-workbench-gpl-5.2.44-src/ext/Makefile.am.orig 2012-10-20 08:30:57.754850970 +0200
++++ mysql-workbench-gpl-5.2.44-src/ext/Makefile.am 2012-10-20 08:31:19.548923647 +0200
+@@ -3,7 +3,7 @@
+ antlr_dirs=antlr-runtime
+ endif
+
+-SUBDIRS=scintilla/gtk vsqlite++ $(antlr_dirs)
++SUBDIRS=scintilla/gtk $(antlr_dirs)
+
+ if BUNDLE_UTILITIES
+ all-am:
+--- mysql-workbench-gpl-5.2.44-src/configure.in.orig 2012-10-20 08:38:28.584365925 +0200
++++ mysql-workbench-gpl-5.2.44-src/configure.in 2012-10-20 08:38:50.359439239 +0200
+@@ -487,8 +487,6 @@
+ res/sqlidedata/Makefile
+ ext/Makefile
+ ext/scintilla/gtk/Makefile
+-ext/vsqlite++/Makefile
+-ext/vsqlite++/src/sqlite/Makefile
+ backend/Makefile
+ backend/wbpublic/Makefile
+ backend/wbprivate/Makefile
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index f6f2eb2..2903b23 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -10,7 +10,7 @@
Summary: A MySQL visual database modeling, administration and querying tool
Name: mysql-workbench
-Version: 5.2.43
+Version: 5.2.44
Release: 1%{?dist}
Group: Applications/Databases
License: GPLv2 with exceptions
@@ -27,11 +27,18 @@ Source1: stripdocs.sh
# don't build extension, use system one
# !!! This patch use versioned soname (libmysqlcppconn.so.6) !!!
Patch1: %{name}-5.2.43-cppconn.patch
+# Use system ctemplate
Patch2: %{name}-5.2.43-ctemplate.patch
+# Use system tinyxml
Patch3: %{name}-5.2.41-tinyxml.patch
+# Use system antlr (keep bundled vsqlite)
Patch4: %{name}-5.2.43-antlr.patch
+# Use system antlr (and vsqlite) - NOT applied
+Patch5: %{name}-5.2.44-antlr.patch
# Disable broken AutoCompletion feature
Patch6: %{name}-5.2.43-noautocc.patch
+# Use system vsqlite++ (not ready) - NOT applied
+Patch7: %{name}-5.2.44-vsqlite.patch
# don't use bundled documentation, redirect to online doc
Patch9: %{name}-5.2.41-nodocs.patch
@@ -74,6 +81,9 @@ BuildRequires: desktop-file-utils
BuildRequires: tinyxml-devel >= 2.6.0
%endif
BuildRequires: libiodbc-devel
+%if 0
+BuildRequires: vsqlite++-devel
+%endif
%if 0%{?fedora} >= 17
BuildRequires: antlr3-C-devel >= 3.4
%endif
@@ -127,6 +137,11 @@ rm -rf ext/cppconn
rm -rf ext/ctemplate
%endif
+%if 0
+%patch7 -p1 -b .vsqlite
+rm -rf ext/vsqlite++
+%endif
+
%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6
%patch3 -p1 -b .tinyxml
rm -rf library/tinyxml
@@ -224,6 +239,11 @@ fi
%changelog
+* Sat Oct 20 2012 Remi Collet <remi at fedoraproject.org> 5.2.44-1
+- update to 5.2.44 Community (OSS) Edition (GPL)
+ http://dev.mysql.com/doc/workbench/en/wb-news-5-2-44.html
+- keep bundled vsqlite++ for now
+
* Fri Sep 14 2012 Remi Collet <remi at fedoraproject.org> 5.2.43-1
- update to 5.2.43 Community (OSS) Edition (GPL)
http://dev.mysql.com/doc/workbench/en/wb-news-5-2-43.html
diff --git a/sources b/sources
index 4e9360a..f077a0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5a7738dd66177ee1f5b58bd560f141a mysql-workbench-nodocs-5.2.43.tar.xz
+975905ec89673eff17b8c150540ae21e mysql-workbench-nodocs-5.2.44.tar.xz
More information about the scm-commits
mailing list