mysql-workbench, sync with f14 + add upstream spec

3 files changed, 214 insertions, 1 deletions

diff --git a/mysql-workbench-gpl-5.2.30-1fc14.spec b/mysql-workbench-gpl-5.2.30-1fc14.spec
new file mode 100644
index 0000000..c5deade
--- /dev/null
+++ b/mysql-workbench-gpl-5.2.30-1fc14.spec
@@ -0,0 +1,101 @@
+%if !%{defined version}
+%define version		5.2.30
+%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: 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-gpl-5.2.32-1fc14.spec b/mysql-workbench-gpl-5.2.32-1fc14.spec
new file mode 100644
index 0000000..0cf8fbd
--- /dev/null
+++ b/mysql-workbench-gpl-5.2.32-1fc14.spec
@@ -0,0 +1,108 @@
+%if !%{defined version}
+%define version		5.2.32
+%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: libglade2-devel >= 2.0.0
+BuildRequires: lua-devel >= 5.1
+BuildRequires: libgnome-devel >= 2
+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
+BuildRequires: Mesa
+%else
+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}
+%configure --disable-debug  --enable-mysql-utilities --disable-dependency-tracking
+%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
+
+%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}/applications/*.desktop
+%dir %{_datadir}/mysql-workbench
+%{_datadir}/mysql-workbench/*
+%{py_sitedir}/*
+
+%changelog
+
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index 621b936..80adaf8 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -7,7 +7,7 @@
 
 Summary:   A MySQL visual database modeling, administration and querying tool
 Name:      mysql-workbench
-Version:   5.2.29
+Version:   5.2.30
 Release:   1%{?dist}
 Group:     Applications/Databases
 License:   GPLv2 with exceptions
@@ -149,6 +149,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Nov 22 2010 Remi Collet <Fedora@famillecollet.com> 5.2.30-1
+- update to 5.2.30 Community (OSS) Edition (GPL)
+  http://dev.mysql.com/doc/workbench/en/wb-news-5-2-30.html
+
 * Tue Oct 12 2010 Remi Collet <Fedora@famillecollet.com> 5.2.29-1
 - update to 5.2.29 Community (OSS) Edition (GPL)
   http://dev.mysql.com/doc/workbench/en/wb-news-5-2-29.html