From 6c05e392ec35cb086813164c311febc22cf250d5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 Dec 2011 07:33:49 +0100 Subject: MySQL Workbench 5.2.37 --- mysql-workbench-gpl-5.2.36-spec | 112 ---------------------------------- mysql-workbench-gpl-5.2.37.spec | 112 ++++++++++++++++++++++++++++++++++ mysql-workbench-oss-5.2.22-1fc12.spec | 92 ---------------------------- mysql-workbench.spec | 14 +++-- 4 files changed, 121 insertions(+), 209 deletions(-) delete mode 100644 mysql-workbench-gpl-5.2.36-spec create mode 100644 mysql-workbench-gpl-5.2.37.spec delete mode 100644 mysql-workbench-oss-5.2.22-1fc12.spec diff --git a/mysql-workbench-gpl-5.2.36-spec b/mysql-workbench-gpl-5.2.36-spec deleted file mode 100644 index 3587899..0000000 --- a/mysql-workbench-gpl-5.2.36-spec +++ /dev/null @@ -1,112 +0,0 @@ -%if !%{defined version} -%define version 5.2.36 -%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 - -%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/* - -%changelog - diff --git a/mysql-workbench-gpl-5.2.37.spec b/mysql-workbench-gpl-5.2.37.spec new file mode 100644 index 0000000..be39359 --- /dev/null +++ b/mysql-workbench-gpl-5.2.37.spec @@ -0,0 +1,112 @@ +%if !%{defined version} +%define version 5.2.37 +%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 + +%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/* + +%changelog + diff --git a/mysql-workbench-oss-5.2.22-1fc12.spec b/mysql-workbench-oss-5.2.22-1fc12.spec deleted file mode 100644 index 71d9068..0000000 --- a/mysql-workbench-oss-5.2.22-1fc12.spec +++ /dev/null @@ -1,92 +0,0 @@ -%if !%{defined version} -%define version 5.2.22 -%endif -%define release 1 -%define edition oss - -Summary: A MySQL visual database modeling tool. -Name: mysql-workbench-%{edition} -Version: %{version} -Release: %{release}%{targos} -Group: Applications/Databases -Vendor: Oracle and/or its affiliates -License: GPL -URL: http://wb.mysql.com -Source: %{name}-%{version}.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 %{defined 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 %{defined suse} -Requires: python-paramiko python-pexpect -%else -Requires: python-paramiko pexpect -%endif -%if %{defined fc12} -Requires: python-sqlite2 -%endif -# requires mysql client pkg (for mysqldump and mysql cmdline client) -Requires: mysql gnome-keyring - -%description -MySQL Workbench is modeling tool that allows you to design -and generate MySQL databases graphically. - - -%prep -%setup -q -n %{name}-%{version} - -%build - -NOCONFIGURE=yes ./autogen.sh -%configure --disable-debug --enable-python-modules -make - -%install -make install DESTDIR=%{buildroot} -%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} - -%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 08b53de..d51a7c1 100644 --- a/mysql-workbench.spec +++ b/mysql-workbench.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%global mw_version 5.2.36 -%global tarversion gpl-5.2.36-src -%global srcversion gpl-5.2.36-src +%global mw_version 5.2.37 +%global tarversion gpl-5.2.37-src +%global srcversion gpl-5.2.37-src # Use system cppconn if a compatible upstream version exists #global cppconnver 1.1.0-0.3.bzr895 @@ -14,7 +14,7 @@ Summary: A MySQL visual database modeling, administration and querying tool Name: mysql-workbench Version: %{mw_version} # also check mysq-utilities release -Release: 3%{?dist} +Release: 1%{?dist} Group: Applications/Databases License: GPLv2 with exceptions @@ -107,7 +107,7 @@ Summary: Scripts for managing and administering MySQL servers # Not yet published (else will be package separatly) # see ext/mysql-utilities/CHANGES.txt Version: 1.0.3 -Release: 0.%{mw_version}%{?dist}.1 +Release: 0.%{mw_version}%{?dist} BuildArch: noarch BuildRequires: python-devel >= 2.4 @@ -252,6 +252,10 @@ update-desktop-database &> /dev/null || : %changelog +* Tue Dec 27 2011 Remi Collet 5.2.37-1 +- update to 5.2.37 Community (OSS) Edition (GPL) + http://dev.mysql.com/doc/workbench/en/wb-news-5-2-37.html + * Fri Dec 16 2011 Remi Collet 5.2.36-3 - patch for server startup/shutdown command fixes bug #767391, upstream http://bugs.mysql.com/63777 -- cgit