From 05d1618579f48ce7d74c7e486e6222744bf4d5b2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Aug 2012 08:13:55 +0200 Subject: MySQL Workbanch 5.2.42 --- mysql-workbench-5.2.41-cppconn.patch | 56 ------------ mysql-workbench-gpl-5.2.41.spec | 165 ----------------------------------- mysql-workbench-gpl-5.2.42.spec | 165 +++++++++++++++++++++++++++++++++++ mysql-workbench.spec | 8 +- 4 files changed, 171 insertions(+), 223 deletions(-) delete mode 100644 mysql-workbench-gpl-5.2.41.spec create mode 100644 mysql-workbench-gpl-5.2.42.spec diff --git a/mysql-workbench-5.2.41-cppconn.patch b/mysql-workbench-5.2.41-cppconn.patch index 7d6d3a7..b40ef35 100644 --- a/mysql-workbench-5.2.41-cppconn.patch +++ b/mysql-workbench-5.2.41-cppconn.patch @@ -34,27 +34,6 @@ diff -up mysql-workbench-gpl-5.2.41-src/ext/Makefile.am.cppconn mysql-workbench- if BUNDLE_UTILITIES all-am: -diff -up mysql-workbench-gpl-5.2.41-src/ext/Makefile.in.cppconn mysql-workbench-gpl-5.2.41-src/ext/Makefile.in ---- mysql-workbench-gpl-5.2.41-src/ext/Makefile.in.cppconn 2012-07-25 05:07:51.000000000 +0200 -+++ mysql-workbench-gpl-5.2.41-src/ext/Makefile.in 2012-08-11 08:33:21.593138333 +0200 -@@ -53,7 +53,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re - distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = scintilla/gtk cppconn vsqlite++ antlr-runtime ctemplate -+DIST_SUBDIRS = scintilla/gtk vsqlite++ antlr-runtime ctemplate - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -@@ -222,7 +222,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - unixodbc = @unixodbc@ - @BUILD_CTEMPLATE_FALSE@ctemplate_dirs = ctemplate --SUBDIRS = scintilla/gtk cppconn vsqlite++ antlr-runtime $(ctemplate_dirs) -+SUBDIRS = scintilla/gtk vsqlite++ antlr-runtime $(ctemplate_dirs) - all: all-recursive - - .SUFFIXES: diff -up mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am.cppconn mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am --- mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am.cppconn 2012-07-25 05:07:40.000000000 +0200 +++ mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am 2012-08-11 08:39:25.157340958 +0200 @@ -82,41 +61,6 @@ diff -up mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.am.cpp #precompiled.h.gch: precompiled.h # $(CXXCOMPILE) precompiled.h -o precompiled.h.gch -diff -up mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.in.cppconn mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.in ---- mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.in.cppconn 2012-07-25 05:07:52.000000000 +0200 -+++ mysql-workbench-gpl-5.2.41-src/frontend/linux/workbench/Makefile.in 2012-08-11 08:40:25.500548195 +0200 -@@ -71,7 +71,6 @@ mysql_workbench_bin_DEPENDENCIES = \ - $(top_srcdir)/library/base/libwbbase.la \ - $(top_srcdir)/library/grt/src/libgrt.la \ - $(top_srcdir)/library/dbc/libcdbc.la \ -- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la \ - $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la \ - $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la \ - $(top_srcdir)/library/canvas/src/libmdcanvas.la \ -@@ -304,7 +303,6 @@ INCLUDES = @GLIB_CFLAGS@ @SIGC_CFLAGS@ @ - -I$(top_srcdir)/modules/wb.model/src\ - -I$(top_srcdir)/modules/interfaces\ - -I$(top_srcdir)/ext\ -- -I$(top_srcdir)/ext/cppconn\ - -I$(top_srcdir)/modules\ - -I$(top_srcdir)/ext/vsqlite++/include\ - -I$(top_srcdir)/ext/scintilla/include\ -@@ -320,14 +318,13 @@ mysql_workbench_bin_LDADD = \ - $(top_srcdir)/library/base/libwbbase.la\ - $(top_srcdir)/library/grt/src/libgrt.la\ - $(top_srcdir)/library/dbc/libcdbc.la\ -- $(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\ - $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la\ - $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\ - $(top_srcdir)/library/canvas/src/libmdcanvas.la\ - $(top_srcdir)/library/mysql55-parser/libmysql55parser.la\ - @CTEMPLATE_LIBS@\ - @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\ -- -lX11 -+ -lmysqlcppconn -lX11 - - mysql_workbench_bin_SOURCES = \ - main.cpp\ diff -up mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp.cppconn mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp --- mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp.cppconn 2012-07-25 05:07:35.000000000 +0200 +++ mysql-workbench-gpl-5.2.41-src/library/dbc/src/driver_manager.cpp 2012-08-11 08:37:39.612984727 +0200 diff --git a/mysql-workbench-gpl-5.2.41.spec b/mysql-workbench-gpl-5.2.41.spec deleted file mode 100644 index a6bd7fe..0000000 --- a/mysql-workbench-gpl-5.2.41.spec +++ /dev/null @@ -1,165 +0,0 @@ -%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-gpl-5.2.42.spec b/mysql-workbench-gpl-5.2.42.spec new file mode 100644 index 0000000..f1b8ce5 --- /dev/null +++ b/mysql-workbench-gpl-5.2.42.spec @@ -0,0 +1,165 @@ +%if !%{defined version} +%define version 5.2.42 +%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 4cf5f2c..f1d5261 100644 --- a/mysql-workbench.spec +++ b/mysql-workbench.spec @@ -10,8 +10,8 @@ Summary: A MySQL visual database modeling, administration and querying tool Name: mysql-workbench -Version: 5.2.41 -Release: 2%{?dist} +Version: 5.2.42 +Release: 1%{?dist} Group: Applications/Databases License: GPLv2 with exceptions @@ -229,6 +229,10 @@ fi %changelog +* Tue Aug 14 2012 Remi Collet 5.2.42-1 +- update to 5.2.42 Community (OSS) Edition (GPL) + http://dev.mysql.com/doc/workbench/en/wb-news-5-2-42.html + * Sat Aug 11 2012 Remi Collet 5.2.41-2 - remove bundled documentation, redirect to online This documentation is NOT distributed under a GPL license -- cgit