Hello community, here is the log from the commit of package mysql-workbench for openSUSE:Factory checked in at 2014-02-05 13:44:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old) and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes 2013-08-23 11:07:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes 2014-02-05 13:44:58.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Oct 7 10:37:52 CEST 2013 - mhruse...@suse.cz + +- updated to version 6.0.7 + http://dev.mysql.com/doc/relnotes/workbench/en/wb-news-6-0-7.html +- further cleanup of spec file + +------------------------------------------------------------------- +Tue Aug 20 08:43:58 UTC 2013 - br...@ioda-net.ch + +- update to version 6.0.6 + * see http://www.mysql.com/products/workbench/ +- packaging : cleaning old options, wb use cmake now + removed no more used patches + mysql-workbench-gpl-5.2.44-ctemplate-fix.patch + mysql-workbench-gpl-5.2.44-avoid-version.patch + mysql-workbench-5.2.47-system-cppconn.patch + +------------------------------------------------------------------- Old: ---- mysql-workbench-5.2.47-system-cppconn.patch mysql-workbench-gpl-5.2.44-avoid-version.patch mysql-workbench-gpl-5.2.44-ctemplate-fix.patch mysql-workbench-gpl-5.2.47-src.tar.bz2 New: ---- mysql-workbench-community-6.0.8-src.tar.bz2 patch-desktop-categories.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-workbench.spec ++++++ --- /var/tmp/diff_new_pack.QxCBvO/_old 2014-02-05 13:45:00.000000000 +0100 +++ /var/tmp/diff_new_pack.QxCBvO/_new 2014-02-05 13:45:00.000000000 +0100 @@ -16,200 +16,196 @@ # -Name: mysql-workbench -Summary: A MySQL visual modeling tool +%define edition community + +# whether at least Python 2.6 is available +%define have_python26 1 +%include %{_rpmconfigdir}/macros.python + +Summary: A MySQL visual database modeling, administration and querying tool License: GPL-2.0+ Group: Productivity/Databases/Clients -Version: 5.2.47 +Name: mysql-workbench +Version: 6.0.8 Release: 0 -Url: http://dev.mysql.com/downloads/workbench -Source: %{name}-gpl-%{version}-src.tar.bz2 +Url: http://wb.mysql.com +Source: %{name}-%{edition}-%{version}-src.tar.bz2 Source1: openSUSE_(Vendor_Package).xml -Patch0: mysql-workbench-gpl-5.2.44-ctemplate-fix.patch -Patch1: mysql-workbench-gpl-5.2.44-avoid-version.patch -Patch2: mysql-workbench-5.2.47-system-cppconn.patch -Summary: A MySQL visual modeling tool -Group: Productivity/Databases/Clients + +#Patches +Patch0: patch-desktop-categories.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build + +# Keep them alphabetic order BuildRequires: Mesa BuildRequires: Mesa-devel +BuildRequires: Mesa-libGL-devel +BuildRequires: ant +BuildRequires: ant-antlr BuildRequires: boost-devel +BuildRequires: cairo-devel >= 1.5.12 BuildRequires: cairomm-devel +BuildRequires: cmake BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel +BuildRequires: gnome-keyring-devel BuildRequires: gtkmm24-devel -BuildRequires: java-devel +BuildRequires: libctemplate-devel BuildRequires: libglade2-devel BuildRequires: libgnome-devel +BuildRequires: libiodbc-devel BuildRequires: libmysqlcppconn-devel BuildRequires: libsigc++2-devel BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: libzip-devel +BuildRequires: vsqlite++-devel %if 0%{?suse_version} > 1210 BuildRequires: lua51-devel %else BuildRequires: lua-devel %endif -BuildRequires: mysql-devel +BuildRequires: make +BuildRequires: mysql-devel > 5.1 BuildRequires: pcre-devel -BuildRequires: php-devel BuildRequires: python-devel -BuildRequires: readline-devel BuildRequires: pkgconfig(libiodbc) BuildRequires: pkgconfig(xxf86vm) %if 0%{?suse_version} -BuildRequires: FastCGI-devel BuildRequires: libuuid-devel BuildRequires: sqlite3-devel BuildRequires: update-desktop-files %endif %if 0%{?fedora} -BuildRequires: fcgi-devel -BuildRequires: java-1.6.0-openjdk-devel -BuildRequires: sqlite-devel -%if 0%{?fedora} > 11 BuildRequires: libuuid-devel -%else -BuildRequires: PolicyKit-gnome -%endif +BuildRequires: sqlite-devel %endif -BuildRequires: cairo-devel >= 1.5.12 -BuildRequires: libctemplate-devel -BuildRequires: libiodbc-devel +BuildRequires: tar +BuildRequires: tinyxml-devel + Requires(post): shared-mime-info Requires(postun): shared-mime-info Requires(post): desktop-file-utils Requires(postun): desktop-file-utils + Requires: python-paramiko Requires: python-pexpect -# Need for SQL Editor -Requires: libmysqlclient_r18 + +# WAS in 5x Need for SQL Editor +#Requires: libmysqlclient_r18 + +## requires mysql client pkg (for mysqldump and mysql cmdline client) +Suggests: gnome-keyring +Suggests: mysqldump + +Provides: %{name}-%{edition} Provides: mysql-administrator = %{version} Provides: mysql-gui-tools = %{version} Provides: mysql-querybrovser = %{version} Obsoletes: mysql-administrator < %{version} Obsoletes: mysql-gui-tools < %{version} Obsoletes: mysql-querybrovser < %{version} +Conflicts: %{name}-oss +Conflicts: %{name}-com-se %description -MySQL Workbench provides DBAs and developers an integrated tools environment -for: - * Database Design & Modeling - * SQL Development (replacing MySQL Query Browser) - * Database Administration (replacing MySQL Administrator) +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. +This is the %{edition} build. %prep -%setup -q -n %{name}-gpl-%{version}-src -%patch0 -p1 -%patch1 -p1 -%patch2 -for j in gpattern.h gmessages.h gthread.h gbase64.h gunicode.h gerror.h gquark.h gtypes.h gmacros.h ; do - for i in `grep -Rl "glib/$j" .`; do - sed -i "s|glib/$j|glib.h|" $i - done -done -%if 0%{?suse_version} > 1230 -for i in `grep -Rl "include.*gtkmm/" .`; do - sed -i 's|gtkmm/[^>"]*|gtkmm.h|' $i -done -%endif -rm -rf ext/ctemplate -rm -rf ext/cppconn + +# Add the -D flag if you don't want to delete the source root on each build +%setup -q -n %{name}-%{edition}-%{version}-src +%patch0 %build -export SUSE_ASNEEDED=0 -export INCLUDES="-I/usr/include/SilverCity -I/usr/include" -# dereferencing type-punned pointer will break strict-aliasing rules -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing ${INCLUDES}" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing ${INCLUDES}" -export NOCONFIGURE=y -rm aclocal.m4 -sh ./autogen.sh --prefix=%{_prefix} --libdir=%{_libdir} -echo autogen done -%configure \ - --disable-static \ - --enable-i18n \ - --with-gnu-ld \ - --enable-mysql-utilities -# Doesn't exist anymore -# --enable-readline \ -#FIX this is too much on obs Out of Memory make %%{?jobs:-j%%jobs} +export PATH=$PWD/bin:$PATH +export CFLAGS="%{optflags}" +export CXXFLAGS="$CFLAGS" +LIB_SUFFIX=%{_lib} +LIB_SUFFIX=${LIB_SUFFIX#lib} +cmake \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_SUFFIX=$LIB_SUFFIX \ + -DCMAKE_BUILD_TYPE=%{edition} \ + -DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \ + -DUSE_UNIXODBC=FALSE + +#%__make %{?_smp_mflags} + +#if too much FIX this is too much on obs Out of Memory use make %{?jobs:-j2} %install -make DESTDIR=%{buildroot} install -cp plugins/README README.plugins -cp modules/README README.modules -rm -f %{buildroot}%{_libdir}/%{name}{,/modules,/plugins}/*.la -rm -f %{buildroot}%{_libdir}/%{name}/lib*[!w][!b].so -rm -f %{buildroot}%{_libdir}/%{name}/lib*.a -install -D -m 0644 images/icons/MySQLWorkbench-48.png %{buildroot}%{_datadir}/pixmaps/%{name}.png -install -D -m 0644 "%{S:1}" %{buildroot}%{_datadir}/%{name}/mysql.profiles +%__make install DESTDIR=%{buildroot} -%if 0%{?suse_version} -mv "%{buildroot}%{_datadir}"/applications/MySQLWorkbench.desktop "$RPM_SOURCE_DIR"/%{name}.desktop -%suse_update_desktop_file -i -r -G "Database GUI Tool" %{name} "GTK;Development;Office;Database;GUIDesigner;" -%fdupes -s %{_datadir}/%{name}/images -%else -mv "%{buildroot}%{_datadir}"/applications/MySQLWorkbench.desktop "%{buildroot}%{_datadir}"/applications/%{name}.desktop -%endif -for i in ChangeLog README.plugins README README.modules COPYING; do - dos2unix $i -done -rm -f %{buildroot}%{_datadir}/mime-info/%{name}.mime -rm -f "%{buildroot}%{_datadir}"/doc/%{name}/{COPYING,README} -rmdir --ignore-fail-on-non-empty "%{buildroot}%{_datadir}"/doc/%{name} -cd "%{buildroot}%{_libdir}/%{name}" -for j in {modules,plugins}; do -cd "$j" -ls -1 *.{wbp,grt}.so | while read i; do - [ -f "$i" ] && ln -s "$i" "`echo "$i" | sed 's|\.so$||'`" -done -cd .. -done -# When below tests fail, we can now remove the chmod -test ! -x %{buildroot}%{_datadir}/%{name}/sshtunnel.py -chmod +x %{buildroot}%{_datadir}/%{name}/sshtunnel.py -test ! -x %{buildroot}%{_libdir}/%{name}/modules/explain_renderer.py -chmod +x %{buildroot}%{_libdir}/%{name}/modules/explain_renderer.py -test ! -x %{buildroot}%{_datadir}/%{name}/extras/build_freetds.sh -chmod +x %{buildroot}%{_datadir}/%{name}/extras/build_freetds.sh - -%fdupes -s $RPM_BUILD_ROOT -cd %{buildroot}%{_libdir}/%{name} -ln -s ../libmysqlcppconn.so.[0-9] mysqlcppconn.so -ln -s ../libmysqlclient_r.so.[0-9][0-9] libmysqlclient_r.so +#Can't we split that in a -doc package ? +#rm -fr %{buildroot}/usr/share/doc/%{name} + +find %{buildroot}%{_libdir}/%{name} -name \*.a -exec rm {} \; -print +find %{buildroot}%{_libdir}/%{name} -name \*.la -exec rm {} \; -print + +install -m 0644 "%{S:1}" %{buildroot}/usr/share/mysql-workbench/mysql.profiles + +mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/%{name}" > %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf +chmod 644 %{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf + +# workaround for prob with libantlr3c not being detected as being provided by pkg in fedora +chmod +x %{buildroot}%{_libdir}/%{name}/*.so +%fdupes -s %{buildroot}/%{_datadir}/%{name} + +# Check for duplicate files +%fdupes -s %{buildroot}%{_prefix} %post +%icon_theme_cache_post %mime_database_post %desktop_database_post +%run_ldconfig %postun +%icon_theme_cache_postun %mime_database_postun %desktop_database_postun - -%clean -rm -rf %{buildroot} +%run_ldconfig %files -%defattr(-,root,root) -%doc COPYING ChangeLog README.plugins README.modules -%{_bindir}/* -/usr/lib/%{name}-bin +%defattr(0644, root, root, 0755) + +%dir %{_datadir}/doc/mysql-workbench +%doc %{_datadir}/doc/mysql-workbench/COPYING +%doc %{_datadir}/doc/mysql-workbench/README + +%attr(0755,root,root) %{_bindir}/mysql* +%attr(0755,root,root) %{_bindir}/wbcopytables +%attr(0755,root,root) %{_libdir}/%{name}/%{name}-bin + %dir %{_libdir}/%{name} -%{_libdir}/%{name}/* -%{_libexecdir}/%{name}-bin +%{_libdir}/%{name}/lib* +%dir %{_libdir}/%{name}/modules +%{_libdir}/%{name}/modules/* +%dir %{_libdir}/%{name}/plugins +%{_libdir}/%{name}/plugins/* + %dir %{_datadir}/%{name} +%{_datadir}/icons/hicolor/*/mimetypes/* +%{_datadir}/icons/hicolor/*/apps/* +%dir %{_datadir}/mime-info +%{_datadir}/mime-info/* +%{_datadir}/mime/packages/* +%{_datadir}/applications/*.desktop %{_datadir}/%{name}/* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/icons/hicolor/*/mimetypes/application-vnd.%{name}-model.png -%{_datadir}/icons/hicolor/*/mimetypes/application-vnd.%{name}-plugin.png -%{_datadir}/mime/packages/%{name}.xml +%attr(0755,root,root) %{_datadir}/%{name}/extras/*.sh + +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}.conf %changelog ++++++ patch-desktop-categories.patch ++++++ --- mysql-workbench.desktop.in 2013-08-09 17:32:50.000000000 +0200 +++ mysql-workbench.desktop.in 2013-08-19 22:11:21.203796254 +0200 @@ -6,4 +6,5 @@ Type=Application Icon=mysql-workbench MimeType=application/vnd.mysql-workbench-model; -Categories=GTK;Database;Development; \ No newline at end of file +Categories=GTK;Development;Office;Database;GUIDesigner; +GenericName=mysql-workbench -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
