first work ob MySQL Workbench 5.2.28

3 files changed, 171 insertions, 7 deletions

diff --git a/mysql-workbench-5.2.26-cppconn.patch b/mysql-workbench-5.2.28-cppconn.patch
index b941d03..65d177f 100644
--- a/mysql-workbench-5.2.26-cppconn.patch
+++ b/mysql-workbench-5.2.28-cppconn.patch
@@ -1,3 +1,15 @@
+diff -up mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp
+--- mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp.cppconn	2010-09-20 19:11:07.100715204 +0200
++++ mysql-workbench-gpl-5.2.28-src/backend/wbprivate/sqlide/wb_sql_editor_form.cpp	2010-09-20 19:11:12.633514446 +0200
+@@ -47,7 +47,7 @@
+ // this doesn't belong here, but there's no other workaround for having access to mysql_info
+ // because of that we also need to link wbprivate directly to the connector, making their
+ // dynamic loading pretty much useless
+-#include <cppconn/../driver/mysql_connection.h>
++#include <mysql_connection.h>
+ 
+ #include "boost_smart_ptr_helpers.h"
+ 
 diff -up mysql-workbench-gpl-5.2.26/configure.in.cppconn mysql-workbench-gpl-5.2.26/configure.in
 --- mysql-workbench-gpl-5.2.26/configure.in.cppconn	2010-08-05 15:33:27.000000000 +0200
 +++ mysql-workbench-gpl-5.2.26/configure.in	2010-08-07 08:11:56.906643649 +0200
@@ -83,3 +95,51 @@ diff -up mysql-workbench-gpl-5.2.26/library/dbc/src/driver_manager.cpp.cppconn m
    }
    
    Driver *(* get_driver_instance)()= NULL;
+diff -up mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am.cppconn mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am
+--- mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am.cppconn	2010-09-20 22:02:44.930765082 +0200
++++ mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.am	2010-09-20 22:03:42.489372852 +0200
+@@ -48,13 +48,11 @@ mysql_workbench_bin_LDADD=\
+ 	$(top_srcdir)/library/base/src/libwbbase.la\
+ 	$(top_srcdir)/library/grt/src/libgrt.la\
+ 	$(top_srcdir)/library/dbc/libcdbc.la\
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
+ 	$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
+ 	$(top_srcdir)/library/canvas/src/libmdcanvas.la\
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
+ 	@CTEMPLATE_LIBS@\
+ 	@GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\
+-	-lX11
++	-lmysqlcppconn -lX11
+ 
+ #precompiled.h.gch: precompiled.h
+ #	$(CXXCOMPILE) precompiled.h -o precompiled.h.gch
+diff -up mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in.cppconn mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in
+--- mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in.cppconn	2010-09-20 22:02:34.683084613 +0200
++++ mysql-workbench-gpl-5.2.28-src/frontend/linux/workbench/Makefile.in	2010-09-20 22:03:30.266939988 +0200
+@@ -71,10 +71,8 @@ mysql_workbench_bin_DEPENDENCIES =  \
+ 	$(top_srcdir)/library/base/src/libwbbase.la \
+ 	$(top_srcdir)/library/grt/src/libgrt.la \
+ 	$(top_srcdir)/library/dbc/libcdbc.la \
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la \
+ 	$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la \
+-	$(top_srcdir)/library/canvas/src/libmdcanvas.la \
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la
++	$(top_srcdir)/library/canvas/src/libmdcanvas.la
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -305,13 +303,11 @@ mysql_workbench_bin_LDADD = \
+ 	$(top_srcdir)/library/base/src/libwbbase.la\
+ 	$(top_srcdir)/library/grt/src/libgrt.la\
+ 	$(top_srcdir)/library/dbc/libcdbc.la\
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
+ 	$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
+ 	$(top_srcdir)/library/canvas/src/libmdcanvas.la\
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.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 --git a/mysql-workbench-gpl-5.2.28-1fc13.spec b/mysql-workbench-gpl-5.2.28-1fc13.spec
new file mode 100644
index 0000000..d3b6ea3
--- /dev/null
+++ b/mysql-workbench-gpl-5.2.28-1fc13.spec
@@ -0,0 +1,102 @@
+%if !%{defined version}
+%define version		5.2.28
+%endif
+%define release		1
+%define edition   gpl
+
+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: libglade2-devel >= 2.0.0
+BuildRequires: lua-devel >= 5.1
+BuildRequires: libgnome-devel >= 2
+BuildRequires: automake autoconf libtool
+BuildRequires: lua-devel
+BuildRequires: libzip-devel libxml2-devel
+BuildRequires: libglade2-devel 
+BuildRequires: readline-devel
+BuildRequires: python-devel >= 2.4
+BuildRequires: gnome-keyring-devel
+BuildRequires: boost-devel
+
+%if %_vendor == suse
+BuildRequires: libmysqlclient-devel
+BuildRequires: Mesa
+%else
+BuildRequires: mysql-devel >= 5.1
+%if !%{defined centos}
+BuildRequires: uuid-devel
+%endif
+BuildRequires: gtkmm24-devel
+BuildRequires: mesa-libGL-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
+%configure --disable-debug 
+make
+
+%install
+make install DESTDIR=%{buildroot}
+
+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
+
+%clean
+rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-%{version}-src
+
+%files
+%defattr(0644, root, root, 0755)
+%doc COPYING
+%attr(0755,root,root) %{_bindir}/mysql-workbench
+%attr(0755,root,root) %{_bindir}/mysql-workbench-bin
+%dir %{_libdir}/mysql-workbench
+%{_libdir}/mysql-workbench/*
+%{_datadir}/applications/*.desktop
+%dir %{_datadir}/mysql-workbench
+%{_datadir}/mysql-workbench/*
+
+%changelog
+
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index b7b16cf..7f81a5c 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -1,11 +1,11 @@
-#global postver b
+%global postver -src
 %global tartype gpl
-%global cppconnver 1.1.0-0.1.bzr888
+%global cppconnver 1.1.0-0.3.bzr895
 
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
-Version:   5.2.27
-Release:   2%{?dist}
+Version:   5.2.28
+Release:   1%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
 
@@ -17,10 +17,9 @@ Source:    %{name}-%{tartype}-%{version}%{?postver}.tar.gz
 
 # don't build extension, use system one
 # !!! This patch use versioned soname !!!
-Patch1:    %{name}-5.2.26-cppconn.patch
+Patch1:    %{name}-5.2.28-cppconn.patch
 Patch2:    %{name}-5.2.22-python.patch
 Patch3:    %{name}-5.2.27-ctemplate.patch
-Patch4:    %{name}-5.2.27-dnl.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pcre-devel >= 3.9
@@ -62,6 +61,7 @@ Requires: mysql-connector-c++ >= %{cppconnver}
 Conflicts: mysql-workbench-oss
 Conflicts: mysql-workbench-ce
 Conflicts: mysql-workbench-gpl
+Conflicts: mysql-workbench-com-se
 
 
 %description
@@ -80,7 +80,6 @@ an integrated tools environment for:
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
 %patch3 -p1 -b .ctemplate
 %endif
-%patch4 -p1 -b .dnl
 
 touch -r COPYING .timestamp4rpm
 %{__sed} -i -e 's/\r//g' COPYING
@@ -148,6 +147,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Sep 20 2010 Remi Collet <Fedora@famillecollet.com> 5.2.28-1
+- update to 5.2.28 Community (OSS) Edition (GPL)
+
 * Sat Sep 18 2010 Remi Collet <Fedora@famillecollet.com> 5.2.27-2
 - remove obsoleted configure options
 - add patch to completely remove ctemplate from build process