From 9de7760cf9fd384d6bb98a7cb7b37d2a073be714 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 20 Oct 2012 09:16:04 +0200
Subject: MySQL Workbench 5.2.44

---
 mysql-workbench-5.2.44-antlr.patch   |  13 +++
 mysql-workbench-5.2.44-vsqlite.patch |  22 +++++
 mysql-workbench-gpl-5.2.43.spec      | 170 -----------------------------------
 mysql-workbench-gpl-5.2.44.spec      | 170 +++++++++++++++++++++++++++++++++++
 mysql-workbench.spec                 |  22 ++++-
 5 files changed, 226 insertions(+), 171 deletions(-)
 create mode 100644 mysql-workbench-5.2.44-antlr.patch
 create mode 100644 mysql-workbench-5.2.44-vsqlite.patch
 delete mode 100644 mysql-workbench-gpl-5.2.43.spec
 create mode 100644 mysql-workbench-gpl-5.2.44.spec

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-gpl-5.2.43.spec b/mysql-workbench-gpl-5.2.43.spec
deleted file mode 100644
index 077b915..0000000
--- a/mysql-workbench-gpl-5.2.43.spec
+++ /dev/null
@@ -1,170 +0,0 @@
-%if !%{defined version}
-%define version		5.2.43
-%endif
-%define release 1
-%define edition   gpl
-# whether at least Python 2.6 is available
-%define have_python26 1
-%include %{_rpmconfigdir}/macros.python
-
-# Directory where iodbc and pyodbc binaries are located. Build both using the build_iodbc.sh script
-# If using distribution provided ODBC manager lib and pyodbc, then comment out this
-%define odbc_home	%{_builddir}/../odbc/usr
-
-Summary: A MySQL visual database modeling, administration and querying tool.
-Name: mysql-workbench-%{edition}
-Version: %{version}
-Release: %{release}%{targos}
-Group: Applications/Databases
-Vendor: Oracle Corporation
-License: GPL
-URL: http://wb.mysql.com
-Source: %{name}-%{version}-src.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pcre-devel >= 3.9
-BuildRequires: lua-devel >= 5.1
-BuildRequires: automake autoconf libtool
-BuildRequires: libzip-devel libxml2-devel
-BuildRequires: python-devel >= 2.5
-BuildRequires: gnome-keyring-devel
-BuildRequires: boost-devel
-
-%if %_vendor == suse
-BuildRequires: libmysqlclient-devel, libctemplate-devel
-BuildRequires: Mesa
-%else
-%if %targos == fc17
-BuildRequires: ctemplate-devel
-%endif
-BuildRequires: mysql-devel >= 5.1
-BuildRequires: gtkmm24-devel
-BuildRequires: mesa-libGL-devel
-BuildRequires: sqlite-devel
-# In Oracle packages, iodbc is bundled, so we don't need it
-#BuildRequires: libiodbc-devel
-BuildRequires: make
-BuildRequires: tar
-BuildRequires: gcc-c++
-%endif
-
-%if %_vendor == suse
-Requires: python-paramiko python-pexpect
-%else
-Requires: python-paramiko pexpect
-%endif
-%if %{defined fc13}
-Requires: python-sqlite2
-%endif
-# requires mysql client pkg (for mysqldump and mysql cmdline client)
-Requires: mysql gnome-keyring
-
-# our old package name
-Obsoletes: mysql-workbench-oss
-Conflicts: mysql-workbench-oss
-Conflicts: mysql-workbench-com-se
-
-%description
-MySQL Workbench is a modeling tool that allows you to design
-and generate MySQL databases graphically. It also has administration
-and query development modules where you can manage MySQL server instances
-and execute SQL queries.
-
-%prep
-%setup -q -n %{name}-%{version}-src
-
-%build
-
-%if %{defined have_python26}
-mysql_utilities_flags=--enable-mysql-utilities
-%endif
-
-%if %targos == el6
-ctemplate_flags=--with-bundled-ctemplate
-%endif
-
-NOCONFIGURE=yes ./autogen.sh
-%if %{defined odbc_home}
-%configure --disable-debug  --disable-dependency-tracking $mysql_utilities_flags $ctemplate_flags --with-odbc-cflags=-I%{odbc_home}/include --with-odbc-libs="-L%{odbc_home}/lib -liodbc"
-%else
-%configure --disable-debug  --disable-dependency-tracking $mysql_utilities_flags $ctemplate_flags
-%endif
-make
-
-%install
-make install DESTDIR=%{buildroot}
-rm -fr %{buildroot}/usr/share/doc/mysql-workbench
-%if %{have_python26}
-make -C ext install-utils DESTDIR=%{buildroot} 
-make -C ext install-connector DESTDIR=%{buildroot} 
-%endif
-
-find %{buildroot}%{_libdir}/mysql-workbench -name \*.a  -exec rm {} \; -print
-find %{buildroot}%{_libdir}/mysql-workbench -name \*.la -exec rm {} \; -print
-
-%if %{defined odbc_home}
-for l in %{odbc_home}/lib/libiodbc.so.* %{odbc_home}/lib/libiodbcinst.so.* %{odbc_home}/lib/libiodbcadm.so.*; do
-cp -a $l %{buildroot}%{_libdir}/mysql-workbench
-/usr/sbin/prelink -u %{buildroot}%{_libdir}/mysql-workbench/`basename $l` || true
-done
-
-if [ %{odbc_home}/../pyodbc.so ]; then
-cp -a %{odbc_home}/../pyodbc.so %{buildroot}%{_libdir}/mysql-workbench/modules
-fi
-cp -a %{odbc_home}/bin/iodbcadm-gtk %{buildroot}%{_libdir}/mysql-workbench/
-%endif
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-if [ -x %{_bindir}/update-desktop-database ]; then
-    %{_bindir}/update-desktop-database
-fi
-
-if [ -x %{_bindir}/update-mime-database ]; then
-    %{_bindir}/update-mime-database %{_datadir}/mime
-fi
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-if [ -x %{_bindir}/update-desktop-database ]; then
-    %{_bindir}/update-desktop-database 
-fi
-
-if [ -x %{_bindir}/update-mime-database ]; then
-    %{_bindir}/update-mime-database %{_datadir}/mime
-fi
-
-
-%clean
-rm -rf %{buildroot}
-rm -rf %{_builddir}/%{name}-%{version}-src
-
-%files 
-%defattr(0644, root, root, 0755)
-%doc COPYING README
-%attr(0755,root,root) %{_bindir}/mysql*
-%attr(0755,root,root) %{_bindir}/wbcopytables
-%attr(0755,root,root) %{_datadir}/mysql-workbench/python/mysql*
-%attr(0755,root,root) %{_datadir}/mysql-workbench/extras/*.sh
-%attr(0755,root,root) %{_libexecdir}/mysql-workbench-bin
-%dir %{_libdir}/mysql-workbench
-%{_libdir}/mysql-workbench/*
-%{_datadir}/icons/hicolor/*/mimetypes/*
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/mime-info/*
-%{_datadir}/mime/packages/*
-%{_datadir}/applications/*.desktop
-%dir %{_datadir}/mysql-workbench
-%{_datadir}/mysql-workbench/*
-
-%attr(0755,root,root) %{_libdir}/mysql-workbench/iodbcadm-gtk
-
-%changelog
-
diff --git a/mysql-workbench-gpl-5.2.44.spec b/mysql-workbench-gpl-5.2.44.spec
new file mode 100644
index 0000000..f9eec5f
--- /dev/null
+++ b/mysql-workbench-gpl-5.2.44.spec
@@ -0,0 +1,170 @@
+%if !%{defined version}
+%define version		5.2.44
+%endif
+%define release 1
+%define edition   gpl
+# whether at least Python 2.6 is available
+%define have_python26 1
+%include %{_rpmconfigdir}/macros.python
+
+# Directory where iodbc and pyodbc binaries are located. Build both using the build_iodbc.sh script
+# If using distribution provided ODBC manager lib and pyodbc, then comment out this
+%define odbc_home	%{_builddir}/../odbc/usr
+
+Summary: A MySQL visual database modeling, administration and querying tool.
+Name: mysql-workbench-%{edition}
+Version: %{version}
+Release: %{release}%{targos}
+Group: Applications/Databases
+Vendor: Oracle Corporation
+License: GPL
+URL: http://wb.mysql.com
+Source: %{name}-%{version}-src.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: pcre-devel >= 3.9
+BuildRequires: lua-devel >= 5.1
+BuildRequires: automake autoconf libtool
+BuildRequires: libzip-devel libxml2-devel
+BuildRequires: python-devel >= 2.5
+BuildRequires: gnome-keyring-devel
+BuildRequires: boost-devel
+
+%if %_vendor == suse
+BuildRequires: libmysqlclient-devel, libctemplate-devel
+BuildRequires: Mesa
+%else
+%if %targos == fc17
+BuildRequires: ctemplate-devel
+%endif
+BuildRequires: mysql-devel >= 5.1
+BuildRequires: gtkmm24-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: sqlite-devel
+# In Oracle packages, iodbc is bundled, so we don't need it
+#BuildRequires: libiodbc-devel
+BuildRequires: make
+BuildRequires: tar
+BuildRequires: gcc-c++
+%endif
+
+%if %_vendor == suse
+Requires: python-paramiko python-pexpect
+%else
+Requires: python-paramiko pexpect
+%endif
+%if %{defined fc13}
+Requires: python-sqlite2
+%endif
+# requires mysql client pkg (for mysqldump and mysql cmdline client)
+Requires: mysql gnome-keyring
+
+# our old package name
+Obsoletes: mysql-workbench-oss
+Conflicts: mysql-workbench-oss
+Conflicts: mysql-workbench-com-se
+
+%description
+MySQL Workbench is a modeling tool that allows you to design
+and generate MySQL databases graphically. It also has administration
+and query development modules where you can manage MySQL server instances
+and execute SQL queries.
+
+%prep
+%setup -q -n %{name}-%{version}-src
+
+%build
+
+%if %{defined have_python26}
+mysql_utilities_flags=--enable-mysql-utilities
+%endif
+
+%if %targos == el6
+ctemplate_flags=--with-bundled-ctemplate
+%endif
+
+NOCONFIGURE=yes ./autogen.sh
+%if %{defined odbc_home}
+%configure --disable-debug  --disable-dependency-tracking $mysql_utilities_flags $ctemplate_flags --with-odbc-cflags=-I%{odbc_home}/include --with-odbc-libs="-L%{odbc_home}/lib -liodbc"
+%else
+%configure --disable-debug  --disable-dependency-tracking $mysql_utilities_flags $ctemplate_flags
+%endif
+make
+
+%install
+make install DESTDIR=%{buildroot}
+rm -fr %{buildroot}/usr/share/doc/mysql-workbench
+%if %{have_python26}
+make -C ext install-utils DESTDIR=%{buildroot} 
+make -C ext install-connector DESTDIR=%{buildroot} 
+%endif
+
+find %{buildroot}%{_libdir}/mysql-workbench -name \*.a  -exec rm {} \; -print
+find %{buildroot}%{_libdir}/mysql-workbench -name \*.la -exec rm {} \; -print
+
+%if %{defined odbc_home}
+for l in %{odbc_home}/lib/libiodbc.so.* %{odbc_home}/lib/libiodbcinst.so.* %{odbc_home}/lib/libiodbcadm.so.*; do
+cp -a $l %{buildroot}%{_libdir}/mysql-workbench
+/usr/sbin/prelink -u %{buildroot}%{_libdir}/mysql-workbench/`basename $l` || true
+done
+
+if [ %{odbc_home}/../pyodbc.so ]; then
+cp -a %{odbc_home}/../pyodbc.so %{buildroot}%{_libdir}/mysql-workbench/modules
+fi
+cp -a %{odbc_home}/bin/iodbcadm-gtk %{buildroot}%{_libdir}/mysql-workbench/
+%endif
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+if [ -x %{_bindir}/update-desktop-database ]; then
+    %{_bindir}/update-desktop-database
+fi
+
+if [ -x %{_bindir}/update-mime-database ]; then
+    %{_bindir}/update-mime-database %{_datadir}/mime
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+if [ -x %{_bindir}/update-desktop-database ]; then
+    %{_bindir}/update-desktop-database 
+fi
+
+if [ -x %{_bindir}/update-mime-database ]; then
+    %{_bindir}/update-mime-database %{_datadir}/mime
+fi
+
+
+%clean
+rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-%{version}-src
+
+%files 
+%defattr(0644, root, root, 0755)
+%doc COPYING README
+%attr(0755,root,root) %{_bindir}/mysql*
+%attr(0755,root,root) %{_bindir}/wbcopytables
+%attr(0755,root,root) %{_datadir}/mysql-workbench/python/mysql*
+%attr(0755,root,root) %{_datadir}/mysql-workbench/extras/*.sh
+%attr(0755,root,root) %{_libexecdir}/mysql-workbench-bin
+%dir %{_libdir}/mysql-workbench
+%{_libdir}/mysql-workbench/*
+%{_datadir}/icons/hicolor/*/mimetypes/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/mime-info/*
+%{_datadir}/mime/packages/*
+%{_datadir}/applications/*.desktop
+%dir %{_datadir}/mysql-workbench
+%{_datadir}/mysql-workbench/*
+
+%attr(0755,root,root) %{_libdir}/mysql-workbench/iodbcadm-gtk
+
+%changelog
+
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 8036318..3e6fcbf 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)
+Patch5:    %{name}-5.2.44-antlr.patch
 # Disable broken AutoCompletion feature
 Patch6:    %{name}-5.2.43-noautocc.patch
+# Use system vsqlite++ (not ready)
+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@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
+
 * Thu Sep 13 2012 Remi Collet <remi@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
-- 
cgit