From 7fb3f0f18093561d6d9525759842549d4d986925 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 5 Aug 2012 16:48:04 +0200 Subject: mysql-workbench: some work to 5.2.41 (not working) --- mysql-workbench-5.2.36-tinyxml.patch | 67 -------------- mysql-workbench-5.2.41-tinyxml.patch | 67 ++++++++++++++ mysql-workbench-gpl-5.2.40.spec | 145 ------------------------------ mysql-workbench-gpl-5.2.41.spec | 165 +++++++++++++++++++++++++++++++++++ mysql-workbench.spec | 24 ++--- 5 files changed, 246 insertions(+), 222 deletions(-) delete mode 100644 mysql-workbench-5.2.36-tinyxml.patch create mode 100644 mysql-workbench-5.2.41-tinyxml.patch delete mode 100644 mysql-workbench-gpl-5.2.40.spec create mode 100644 mysql-workbench-gpl-5.2.41.spec diff --git a/mysql-workbench-5.2.36-tinyxml.patch b/mysql-workbench-5.2.36-tinyxml.patch deleted file mode 100644 index 85da580..0000000 --- a/mysql-workbench-5.2.36-tinyxml.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -up mysql-workbench-gpl-5.2.36-src/backend/wbprivate/Makefile.am.tinyxml mysql-workbench-gpl-5.2.36-src/backend/wbprivate/Makefile.am ---- mysql-workbench-gpl-5.2.36-src/backend/wbprivate/Makefile.am.tinyxml 2011-12-02 12:37:03.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/backend/wbprivate/Makefile.am 2011-12-10 07:49:14.230858719 +0100 -@@ -13,8 +13,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR - -I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src\ - -I$(top_srcdir)/ext/scintilla/include\ - -I$(top_srcdir)/ext/vsqlite++/include\ -- -I$(top_srcdir)/ext/vsqlite\ -- -I$(top_srcdir)/ext/tinyxml -+ -I$(top_srcdir)/ext/vsqlite - - libwbprivate_a_SOURCES=\ - model/canvas_floater.cpp\ -@@ -76,11 +75,7 @@ libwbprivate_a_SOURCES=\ - $(top_srcdir)/frontend/common/grt_python_debugger.cpp\ - $(top_srcdir)/frontend/common/plugin_manager_window.cpp\ - $(top_srcdir)/frontend/common/plugin_install_window.cpp\ -- $(top_srcdir)/frontend/common/select_option_dialog.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxml.cpp\ -- $(top_srcdir)/ext/tinyxml/tinystr.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp -+ $(top_srcdir)/frontend/common/select_option_dialog.cpp - - #BUILT_SOURCES=stdafx.h.gch - #stdafx.h.gch: workbench/stdafx.h -diff -up mysql-workbench-gpl-5.2.36-src/library/forms/Makefile.am.tinyxml mysql-workbench-gpl-5.2.36-src/library/forms/Makefile.am ---- mysql-workbench-gpl-5.2.36-src/library/forms/Makefile.am.tinyxml 2011-12-02 12:37:01.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/library/forms/Makefile.am 2011-12-10 07:49:59.540022494 +0100 -@@ -74,7 +74,7 @@ gtk/src/lf_menu.cpp\ - gtk/src/lf_menubar.cpp\ - gtk/src/lf_hypertext.cpp - --libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@ -+libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@ -ltinyxml - - INCLUDES=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_KEYRING_CFLAGS@ @PCRE_CFLAGS@ \ - -I$(top_srcdir)/library/forms\ -@@ -86,7 +86,6 @@ INCLUDES=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @S - -I$(top_srcdir)/ext/vsqlite\ - -I$(top_srcdir)/library/\ - -I$(top_srcdir)/ext\ ---I$(top_srcdir)/ext/tinyxml\ - -I$(top_srcdir)/ext/scintilla/include - - -diff -up mysql-workbench-gpl-5.2.36-src/modules/wb.mysql.import/Makefile.am.tinyxml mysql-workbench-gpl-5.2.36-src/modules/wb.mysql.import/Makefile.am ---- mysql-workbench-gpl-5.2.36-src/modules/wb.mysql.import/Makefile.am.tinyxml 2011-12-02 12:37:03.000000000 +0100 -+++ mysql-workbench-gpl-5.2.36-src/modules/wb.mysql.import/Makefile.am 2011-12-10 07:44:49.683838383 +0100 -@@ -17,7 +17,6 @@ INCLUDES=\ - -I$(top_srcdir)/library/sql-parser/source/linux\ - -I$(top_srcdir)/ext/vsqlite\ - -I$(top_srcdir)/ext/vsqlite++/include\ -- -I$(top_srcdir)/ext/tinyxml\ - @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ - - -@@ -26,8 +25,4 @@ wb_mysql_import_grt_la_LDFLAGS=-module - - wb_mysql_import_grt_la_SOURCES=\ - src/wb_mysql_import.cpp\ -- src/wb_mysql_import_dbd4.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxml.cpp\ -- $(top_srcdir)/ext/tinyxml/tinystr.cpp\ -- $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp -+ src/wb_mysql_import_dbd4.cpp diff --git a/mysql-workbench-5.2.41-tinyxml.patch b/mysql-workbench-5.2.41-tinyxml.patch new file mode 100644 index 0000000..508d6d7 --- /dev/null +++ b/mysql-workbench-5.2.41-tinyxml.patch @@ -0,0 +1,67 @@ +diff -up mysql-workbench-gpl-5.2.41-src/backend/wbprivate/Makefile.am.tinyxml mysql-workbench-gpl-5.2.41-src/backend/wbprivate/Makefile.am +--- mysql-workbench-gpl-5.2.41-src/backend/wbprivate/Makefile.am.tinyxml 2012-07-25 05:07:37.000000000 +0200 ++++ mysql-workbench-gpl-5.2.41-src/backend/wbprivate/Makefile.am 2012-08-05 16:19:08.160804046 +0200 +@@ -13,8 +13,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR + -I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src\ + -I$(top_srcdir)/ext/scintilla/include\ + -I$(top_srcdir)/ext/vsqlite++/include\ +- -I$(top_srcdir)/ext/vsqlite\ +- -I$(top_srcdir)/ext/tinyxml ++ -I$(top_srcdir)/ext/vsqlite + + libwbprivate_a_SOURCES=\ + model/canvas_floater.cpp\ +@@ -78,11 +77,7 @@ libwbprivate_a_SOURCES=\ + $(top_srcdir)/frontend/common/grt_python_debugger.cpp\ + $(top_srcdir)/frontend/common/plugin_manager_window.cpp\ + $(top_srcdir)/frontend/common/plugin_install_window.cpp\ +- $(top_srcdir)/frontend/common/select_option_dialog.cpp\ +- $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\ +- $(top_srcdir)/ext/tinyxml/tinyxml.cpp\ +- $(top_srcdir)/ext/tinyxml/tinystr.cpp\ +- $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp ++ $(top_srcdir)/frontend/common/select_option_dialog.cpp + + #BUILT_SOURCES=stdafx.h.gch + #stdafx.h.gch: workbench/stdafx.h +diff -up mysql-workbench-gpl-5.2.41-src/library/forms/Makefile.am.tinyxml mysql-workbench-gpl-5.2.41-src/library/forms/Makefile.am +--- mysql-workbench-gpl-5.2.41-src/library/forms/Makefile.am.tinyxml 2012-07-25 05:07:41.000000000 +0200 ++++ mysql-workbench-gpl-5.2.41-src/library/forms/Makefile.am 2012-08-05 16:20:10.931998514 +0200 +@@ -79,7 +79,7 @@ gtk/src/lf_menubar.cpp\ + gtk/src/lf_find_panel.cpp\ + gtk/src/lf_hypertext.cpp + +-libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@ ++libmforms_la_LIBADD=@GNOME_LIBS@ @GNOME_KEYRING_LIBS@ -ltinyxml + + INCLUDES=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_KEYRING_CFLAGS@ @PCRE_CFLAGS@ -DSCI_NAMESPACE\ + -I$(top_srcdir)/library/forms\ +@@ -91,7 +91,6 @@ INCLUDES=@GLIB_CFLAGS@ @GNOME_CFLAGS@ @S + -I$(top_srcdir)/ext/vsqlite\ + -I$(top_srcdir)/library/\ + -I$(top_srcdir)/ext\ +--I$(top_srcdir)/ext/tinyxml\ + -I$(top_srcdir)/ext/scintilla/include + + +diff -up mysql-workbench-gpl-5.2.41-src/modules/wb.mysql.import/Makefile.am.tinyxml mysql-workbench-gpl-5.2.41-src/modules/wb.mysql.import/Makefile.am +--- mysql-workbench-gpl-5.2.41-src/modules/wb.mysql.import/Makefile.am.tinyxml 2012-07-25 05:07:39.000000000 +0200 ++++ mysql-workbench-gpl-5.2.41-src/modules/wb.mysql.import/Makefile.am 2012-08-05 16:19:08.161804049 +0200 +@@ -17,7 +17,6 @@ INCLUDES=\ + -I$(top_srcdir)/library/sql-parser/source/linux\ + -I$(top_srcdir)/ext/vsqlite\ + -I$(top_srcdir)/ext/vsqlite++/include\ +- -I$(top_srcdir)/ext/tinyxml\ + @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@ + + +@@ -26,8 +25,4 @@ wb_mysql_import_grt_la_LDFLAGS=-module + + wb_mysql_import_grt_la_SOURCES=\ + src/wb_mysql_import.cpp\ +- src/wb_mysql_import_dbd4.cpp\ +- $(top_srcdir)/ext/tinyxml/tinyxmlparser.cpp\ +- $(top_srcdir)/ext/tinyxml/tinyxml.cpp\ +- $(top_srcdir)/ext/tinyxml/tinystr.cpp\ +- $(top_srcdir)/ext/tinyxml/tinyxmlerror.cpp ++ src/wb_mysql_import_dbd4.cpp diff --git a/mysql-workbench-gpl-5.2.40.spec b/mysql-workbench-gpl-5.2.40.spec deleted file mode 100644 index f59aed1..0000000 --- a/mysql-workbench-gpl-5.2.40.spec +++ /dev/null @@ -1,145 +0,0 @@ -%if !%{defined version} -%define version 5.2.40 -%endif -%define release 1 -%define edition gpl -%define have_python26 1 -%include %{_rpmconfigdir}/macros.python - -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 == fc15 -BuildRequires: ctemplate-devel -%endif -BuildRequires: mysql-devel >= 5.1 -BuildRequires: gtkmm24-devel -BuildRequires: mesa-libGL-devel -BuildRequires: sqlite-devel -%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 - -NOCONFIGURE=yes ./autogen.sh -%if %{have_python26} -%if %targos == el6 -%configure --disable-debug --enable-mysql-utilities --disable-dependency-tracking --with-bundled-ctemplate -%else -%configure --disable-debug --enable-mysql-utilities --disable-dependency-tracking -%endif -%else -%configure --disable-debug --disable-dependency-tracking -%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 centos} -for l in libpixman-1.so.0 libcairo.so.2 libatkmm-1.6.so.1 libcairomm-1.0.so.1 libgdkmm-2.4.so.1 libglibmm-2.4.so.1 libgtkmm-2.4.so.1 libpangomm-1.4.so.1 libzip.so.1 libsigc-2.0.so.0; do -cp %{_libdir}/$l %{buildroot}/%{_libdir}/mysql-workbench -/usr/sbin/prelink -u %{buildroot}/%{_libdir}/mysql-workbench/$l || true -done -%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* -%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/* - -%changelog - diff --git a/mysql-workbench-gpl-5.2.41.spec b/mysql-workbench-gpl-5.2.41.spec new file mode 100644 index 0000000..a6bd7fe --- /dev/null +++ b/mysql-workbench-gpl-5.2.41.spec @@ -0,0 +1,165 @@ +%if !%{defined version} +%define version 5.2.41 +%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 +#BuildRequires: libiodbc-devel + +%if %_vendor == suse +BuildRequires: libmysqlclient-devel, libctemplate-devel +BuildRequires: Mesa +%else +%if %targos == fc15 +BuildRequires: ctemplate-devel +%endif +BuildRequires: mysql-devel >= 5.1 +BuildRequires: gtkmm24-devel +BuildRequires: mesa-libGL-devel +BuildRequires: sqlite-devel +%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 +%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 f5782b5..7034343 100644 --- a/mysql-workbench.spec +++ b/mysql-workbench.spec @@ -1,9 +1,6 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%global mw_version 5.2.40 -%global mw_release 1 -%global tarversion gpl-%{mw_version}-src -%global srcversion gpl-%{mw_version}-src +%global tarversion gpl-%{version}-src # Use system cppconn if a compatible upstream version exists #global cppconnver 1.1.0-0.3.bzr895 @@ -13,8 +10,8 @@ Summary: A MySQL visual database modeling, administration and querying tool Name: mysql-workbench -Version: %{mw_version} -Release: %{mw_release}%{?dist} +Version: 5.2.41 +Release: 1%{?dist} Group: Applications/Databases License: GPLv2 with exceptions @@ -28,7 +25,7 @@ Source: http://gd.tuwien.ac.at/db/mysql/Downloads/MySQLGUITools/%{name}-%{tar # !!! This patch use versioned soname (libmysqlcppconn.so.5) !!! Patch1: %{name}-5.2.28-cppconn.patch Patch2: %{name}-5.2.32-ctemplate.patch -Patch3: %{name}-5.2.36-tinyxml.patch +Patch3: %{name}-5.2.41-tinyxml.patch # http://bugs.mysql.com/63898 - fix for automake >= 1.11.2 Patch8: %{name}-5.2.37-automake.patch @@ -69,6 +66,7 @@ BuildRequires: desktop-file-utils %if 0%{?fedora} >= 14 || 0%{?rhel} >= 6 BuildRequires: tinyxml-devel >= 2.6.0 %endif +BuildRequires: libiodbc-devel Requires: python-paramiko pexpect %if 0%{?fedora} < 17 @@ -103,7 +101,7 @@ an integrated tools environment for: %prep -%setup -q -n %{name}-%{srcversion} +%setup -q -n %{name}-%{tarversion} %if 0%{?cppconnver:1} %patch1 -p1 -b .cppconn @@ -111,7 +109,7 @@ rm -rf ext/cppconn %endif %if 0%{?fedora} >= 12 -%patch2 -p1 -b .ctemplate +#patch2 -p1 -b .ctemplate rm -rf ext/ctemplate %endif @@ -120,7 +118,7 @@ rm -rf ext/ctemplate rm -rf library/tinyxml %endif -%patch8 -p1 -b .automake +#patch8 -p1 -b .automake touch -r COPYING .timestamp4rpm @@ -145,6 +143,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive" %if 0%{?fedora} < 12 && 0%{?rhel} < 7 --with-bundled-ctemplate \ %endif + --with-odbc-cflags="$(pkg-config --cflags libiodbc)" \ + --with-odbc-libs="$(pkg-config --libs libiodbc)" \ --enable-mysql-utilities make %{?_smp_mflags} @@ -204,6 +204,10 @@ fi %changelog +* Sun Aug 05 2012 Remi Collet 5.2.41-1 +- update to 5.2.41 Community (OSS) Edition (GPL) + http://dev.mysql.com/doc/workbench/en/wb-news-5-2-41.html + * Tue May 15 2012 Remi Collet 5.2.40-1 - update to 5.2.40 Community (OSS) Edition (GPL) http://dev.mysql.com/doc/workbench/en/wb-news-5-2-40.html -- cgit