Hello community, here is the log from the commit of package mysql-gui-tools for openSUSE:Factory checked in at Tue Jun 2 13:07:42 CEST 2009. -------- --- mysql-gui-tools/mysql-gui-tools.changes 2009-04-14 19:58:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql-gui-tools/mysql-gui-tools.changes 2009-06-01 17:17:22.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 1 17:16:19 CEST 2009 - mhrusecky@suse.cz + +- fixed another build error +- fixed end of files + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-gui-tools.spec ++++++ --- /var/tmp/diff_new_pack.U32213/_old 2009-06-02 13:07:15.000000000 +0200 +++ /var/tmp/diff_new_pack.U32213/_new 2009-06-02 13:07:15.000000000 +0200 @@ -24,10 +24,10 @@ BuildRequires: Mesa-devel lua50-devel Summary: Common Files for MySQL GUI Tools Version: 5.0r14 -Release: 2 +Release: 3 Group: Productivity/Databases/Clients License: GPL v2 or later -Url: http://www.mysql.com/products/tools/query-browser/ +Url: http://dev.mysql.com/downloads/gui-tools Source: %{name}-%{version}.tar.bz2 Source1: mysql-administrator-doc.tar.bz2 Source2: mysql-query-browser-doc.tar.bz2 @@ -43,6 +43,8 @@ Patch40: mysql-gui-tools-gcc-errors.patch Patch41: mysql-gui-tools-path-changes.patch Patch42: mysql-gui-tools-new-gtk.patch +# PATCH-FIX-UPSTREAM: mysql-gui-tools-gcc4.4.patch [ upstream#45246 ] mhrusecky@suse.cz -- fixes compilation issues +# http://bugs.mysql.com/45246 Patch43: mysql-gui-tools-gcc4.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: mysql-administrator mysql-query-browser mysql-workbench @@ -118,12 +120,19 @@ # fixing old GTK macros %patch42 -p1 # fixing build for gcc 4.4 -%patch43 -p1 +%patch43 # Getting rid of BOM for file in common/library/base-library/source/myx_database_model.c; do xxd "$file" | sed 's|^0000000:\ efbb\ bf|0000000:\ 2020\ 20|g' | xxd -r > "$file.new" mv "$file.new" "$file" done +# Fix endlines +dos2unixConversion() { + %{__sed} -i 's/\r//g' "$1" +} +for i in common/COPYING administrator/{ChangeLog,COPYING,res/FAQ} query-browser/{COPYING,res/doc/*.html,res/doc/*.css}; do + dos2unixConversion "$i" +done %build # common @@ -190,6 +199,9 @@ %{_datadir}/mysql-gui/query-browser/ %changelog +* Mon Jun 01 2009 mhrusecky@suse.cz +- fixed another build error +- fixed end of files * Tue Apr 14 2009 mhrusecky@suse.cz - fixed build for gcc 4.4 * Fri Feb 20 2009 mhrusecky@suse.cz ++++++ mysql-gui-tools-gcc4.4.patch ++++++ --- /var/tmp/diff_new_pack.U32213/_old 2009-06-02 13:07:16.000000000 +0200 +++ /var/tmp/diff_new_pack.U32213/_new 2009-06-02 13:07:16.000000000 +0200 @@ -1,6 +1,7 @@ -diff -Naru mysql-gui-tools-5.0r14-bak/common/library/generic-canvas/source/myx_gc_variant.cpp mysql-gui-tools-5.0r14/common/library/generic-canvas/source/myx_gc_variant.cpp ---- mysql-gui-tools-5.0r14-bak/common/library/generic-canvas/source/myx_gc_variant.cpp 2009-04-14 19:09:37.000000000 +0200 -+++ mysql-gui-tools-5.0r14/common/library/generic-canvas/source/myx_gc_variant.cpp 2009-04-14 19:12:06.000000000 +0200 +Index: common/library/generic-canvas/source/myx_gc_variant.cpp +=================================================================== +--- common/library/generic-canvas/source/myx_gc_variant.cpp.orig ++++ common/library/generic-canvas/source/myx_gc_variant.cpp @@ -22,6 +22,7 @@ #include "myx_gc_variant.h" @@ -9,3 +10,16 @@ //---------------------------------------------------------------------------------------------------------------------- +Index: common/source/linux/MySQLGRT/MGRT.cc +=================================================================== +--- common/source/linux/MySQLGRT/MGRT.cc.orig ++++ common/source/linux/MySQLGRT/MGRT.cc +@@ -891,7 +891,7 @@ void MGRT::set_global_value(const char * + + void MGRT::unset_global_value(const char *path) + { +- char *end= strrchr(path, '/'); ++ const char *end= strrchr(path, '/'); + std::string subpath(path, end-path); + MYX_GRT_VALUE *dict; + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org