rpms/mysql-gui-tools/devel mysql-gui-tools-5.0r14-common-cleanup.patch, NONE, 1.1 mysql-gui-tools-5.0r14-common.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gtk_deprecated_typedefs.patch, 1.1, 1.2 mysql-gui-tools-5.0_p12-gcc-4.3.patch, 1.1, 1.2 mysql-gui-tools-5.0_p12-libsigc++-2.2.patch, 1.1, 1.2 mysql-gui-tools-5.0r12-DEBUG.patch, 1.1, 1.2 mysql-gui-tools-gtksourceview-cflags.patch, 1.1, 1.2 mysql-gui-tools.spec, 1.14, 1.15 mysql-query-browser-default_schema_infinite_loop.patch, 1.1, 1.2 sources, 1.3, 1.4
Dennis Gilmore
ausil at fedoraproject.org
Tue Sep 1 04:33:34 UTC 2009
Author: ausil
Update of /cvs/extras/rpms/mysql-gui-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11607
Modified Files:
.cvsignore gtk_deprecated_typedefs.patch
mysql-gui-tools-5.0_p12-gcc-4.3.patch
mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
mysql-gui-tools-5.0r12-DEBUG.patch
mysql-gui-tools-gtksourceview-cflags.patch
mysql-gui-tools.spec
mysql-query-browser-default_schema_infinite_loop.patch sources
Added Files:
mysql-gui-tools-5.0r14-common-cleanup.patch
mysql-gui-tools-5.0r14-common.patch
Log Message:
update to mysql-gui-tools 5.0r14
mysql-gui-tools-5.0r14-common-cleanup.patch:
administrator/source/mac/MySQL Administrator.xcodeproj/kojima.pbxuser | 44
administrator/source/mac/MySQL Administrator.xcodeproj/project.pbxproj | 6
mysql-gui-tools-5.0r14/administrator/README.MacOSX | 6
mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesCommercial.cmd | 2
mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesDebug.cmd | 4
mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesRelease.cmd | 4
mysql-gui-tools-5.0r14/administrator/configure.in | 6
mysql-gui-tools-5.0r14/administrator/extract_pot.sh | 2
mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.sln | 4
mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.vcproj | 16
mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibraryTests.sln | 2
mysql-gui-tools-5.0r14/administrator/library/libmysqladmin.bdsproj | 10
mysql-gui-tools-5.0r14/administrator/library/libmysqladmin_static.bdsproj | 10
mysql-gui-tools-5.0r14/administrator/library/source/Makefile.am | 8
mysql-gui-tools-5.0r14/administrator/mysql-administrator.spec.in | 6
mysql-gui-tools-5.0r14/administrator/po/Makefile.in.in | 4
mysql-gui-tools-5.0r14/administrator/po/update.sh | 2
mysql-gui-tools-5.0r14/administrator/res/FAQ | 2
mysql-gui-tools-5.0r14/administrator/setup/windows/Makefile.mak | 2
mysql-gui-tools-5.0r14/administrator/setup/windows/source/mysql_administrator.xml | 36
mysql-gui-tools-5.0r14/administrator/source/linux/Makefile.am | 16
mysql-gui-tools-5.0r14/administrator/source/util/Makefile.am | 12
mysql-gui-tools-5.0r14/administrator/testing/test-application/Makefile | 2
mysql-gui-tools-5.0r14/common/README.translating | 6
mysql-gui-tools-5.0r14/common/build/MakePoConcat.cmd | 2
mysql-gui-tools-5.0r14/common/build/MakePoLinux.cmd | 2
mysql-gui-tools-5.0r14/common/build/UpdateTranslations.cmd | 2
mysql-gui-tools-5.0r14/common/confdefs.h | 2
mysql-gui-tools-5.0r14/common/configure.in | 2
mysql-gui-tools-5.0r14/common/extract_pot.sh | 6
mysql-gui-tools-5.0r14/common/library/base-library/libmysqlx_static.bdsproj | 10
mysql-gui-tools-5.0r14/common/library/generic-canvas/ftgl/ftgl_static_lib.bdsproj | 8
mysql-gui-tools-5.0r14/common/library/generic-canvas/ftgl/mac/FTGL.xcodeproj/kojima.perspective | 2
mysql-gui-tools-5.0r14/common/library/generic-canvas/ftgl/win32_vcpp/ftgl.suo |binary
mysql-gui-tools-5.0r14/common/library/generic-canvas/libmysqlgc.bdsproj | 4
mysql-gui-tools-5.0r14/common/library/grt-modules/MySQLGrtBuiltinModuleLibrary.vcproj | 2
mysql-gui-tools-5.0r14/common/library/grt-wb-controller/MySQLGrtWorkbenchLibrary.vcproj | 8
mysql-gui-tools-5.0r14/common/library/mysql-resultset/MySQLSqlResultset.vcproj | 6
mysql-gui-tools-5.0r14/common/library/mysql-resultset/libmysqlgc.bdsproj | 4
mysql-gui-tools-5.0r14/common/library/sql-parser/bison.bat | 2
mysql-gui-tools-5.0r14/common/library/sql-parser/source/myx_sql_parser.tab.cc | 3260 +++++-----
mysql-gui-tools-5.0r14/common/library/sql-parser/test/test.vcproj | 2
mysql-gui-tools-5.0r14/common/library/utilities/libmysqlutil_static.bdsproj | 10
mysql-gui-tools-5.0r14/common/po/de.po | 2
mysql-gui-tools-5.0r14/common/po/ja.po | 2
mysql-gui-tools-5.0r14/common/po/pt_BR.po | 2
mysql-gui-tools-5.0r14/common/res/grt/php.ini | 2
mysql-gui-tools-5.0r14/common/res/how_to_translate.txt | 2
mysql-gui-tools-5.0r14/common/source/linux/MGConnectDialog.cc | 2
mysql-gui-tools-5.0r14/common/source/linux/MGConnectDialog.cc.sigc++ | 2
mysql-gui-tools-5.0r14/common/source/mac/GenericCanvas/GenericCanvas.xcodeproj/kojima.perspective | 2
mysql-gui-tools-5.0r14/common/source/mac/MySQLGRT/MySQLGRT.xcodeproj/kojima.perspective | 2
mysql-gui-tools-5.0r14/common/source/mac/MySQLGUICommon.xcodeproj/kojima.mode1 | 2
mysql-gui-tools-5.0r14/common/source/mac/MySQLGUICommon.xcodeproj/kojima.pbxuser | 12
mysql-gui-tools-5.0r14/common/source/mac/MySQLGUICommon.xcodeproj/kojima.perspective | 2
mysql-gui-tools-5.0r14/common/source/mac/WBCanvas/WBCanvas.xcodeproj/kojima.pbxuser | 4
mysql-gui-tools-5.0r14/common/source/mac/WBCanvas/WBCanvas.xcodeproj/kojima.perspective | 2
mysql-gui-tools-5.0r14/common/source/windows/GenericCanvasTestframe/CanvasTest.bdsproj | 4
mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtSh.bdsproj | 2
mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtSh.cfg | 8
mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtSh.dof | 16
mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtSh.dpr | 6
mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtShDebug.cfg | 8
mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtShDebug.dof | 16
mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtShRelease.cfg | 8
mysql-gui-tools-5.0r14/common/source/windows/xgrtsh/XGrtShRelease.dof | 16
mysql-gui-tools-5.0r14/common/tools/grtsh/grtsh.bdsproj | 10
mysql-gui-tools-5.0r14/migration-tool/build/MakeGrtShellDebug.bat | 4
mysql-gui-tools-5.0r14/migration-tool/build/MakeGrtShellRelease.bat | 4
mysql-gui-tools-5.0r14/migration-tool/build/MakeLua.bat | 2
mysql-gui-tools-5.0r14/migration-tool/build/MakePhp.bat | 4
mysql-gui-tools-5.0r14/migration-tool/build/MakeResources.bat | 2
mysql-gui-tools-5.0r14/migration-tool/build/MakeXGrtShellRelease.bat | 4
mysql-gui-tools-5.0r14/migration-tool/build/PreparePhpCode.bat | 4
mysql-gui-tools-5.0r14/migration-tool/build_mt_script.sh | 16
mysql-gui-tools-5.0r14/migration-tool/make_grtjar.sh | 2
mysql-gui-tools-5.0r14/migration-tool/setup/windows/Makefile.mak | 2
mysql-gui-tools-5.0r14/migration-tool/setup/windows/source/mysql_migration_toolkit.xml | 36
mysql-gui-tools-5.0r14/migration-tool/source/agent/Makefile | 6
mysql-gui-tools-5.0r14/migration-tool/source/linux/Makefile | 14
mysql-gui-tools-5.0r14/query-browser/build/CopyLibrariesCommercial.bat | 2
mysql-gui-tools-5.0r14/query-browser/build/CopyLibrariesDebug.bat | 4
mysql-gui-tools-5.0r14/query-browser/build/CopyLibrariesRelease.bat | 4
mysql-gui-tools-5.0r14/query-browser/configure.in | 6
mysql-gui-tools-5.0r14/query-browser/library/MySQLQueryBrowserLibrary.sln | 4
mysql-gui-tools-5.0r14/query-browser/library/MySQLQueryBrowserLibrary.vcproj | 32
mysql-gui-tools-5.0r14/query-browser/library/MySQLQueryBrowserLibraryTests.sln | 2
mysql-gui-tools-5.0r14/query-browser/library/libmysqlqb.bdsproj | 10
mysql-gui-tools-5.0r14/query-browser/library/source/Makefile.am | 8
mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/Makefile.am | 8
mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/test.bat | 2
mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/test.sh | 2
mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_analyze/test_query_analyze.vcproj | 2
mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/Makefile.am | 8
mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/test.bat | 2
mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/test.sh | 2
mysql-gui-tools-5.0r14/query-browser/library/tests/test_query_composition/test_query_composition.vcproj | 2
mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/Makefile.am | 8
mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/test.bat | 2
mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/test.sh | 2
mysql-gui-tools-5.0r14/query-browser/library/tests/test_strip_sql/test_strip_sql.vcproj | 2
mysql-gui-tools-5.0r14/query-browser/mysql-query-browser.spec.in | 6
mysql-gui-tools-5.0r14/query-browser/po/update.sh | 2
mysql-gui-tools-5.0r14/query-browser/setup/windows/Makefile.mak | 2
mysql-gui-tools-5.0r14/query-browser/setup/windows/source/mysql_query_browser.xml | 36
mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am | 16
query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser | 26
query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj | 16
108 files changed, 1999 insertions(+), 1999 deletions(-)
--- NEW FILE mysql-gui-tools-5.0r14-common-cleanup.patch ---
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesCommercial.cmd mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesCommercial.cmd
--- mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesCommercial.cmd 2008-09-12 09:55:30.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesCommercial.cmd 2009-08-31 22:54:59.000000000 -0500
@@ -2,7 +2,7 @@
@echo off
echo Building commercial libraries...
-copy ..\..\mysql-gui-common\library\Lib_Commercial\libmysqlx.dll ..\bin\windows\libmysqlx.dll
+copy ..\..\common\library\Lib_Commercial\libmysqlx.dll ..\bin\windows\libmysqlx.dll
copy ..\library\Lib_Commercial\libmysqladmin.dll ..\bin\windows\libmysqladmin.dll
if exist ..\bin\windows\msvcr71d.dll del ..\bin\windows\msvcr71d.dll
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesDebug.cmd mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesDebug.cmd
--- mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesDebug.cmd 2008-09-12 09:55:30.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesDebug.cmd 2009-08-31 22:54:59.000000000 -0500
@@ -1,8 +1,8 @@
REM CommandInterpreter: $(COMSPEC)
@echo off
-copy ..\..\mysql-gui-common\library\Lib_Debug\libmysqlx.dll ..\bin\windows\libmysqlx.dll
-copy ..\..\mysql-gui-common\library_util\Lib_Debug\libmysqlutil.dll ..\bin\windows\libmysqlutil.dll
+copy ..\..\common\library\Lib_Debug\libmysqlx.dll ..\bin\windows\libmysqlx.dll
+copy ..\..\common\library_util\Lib_Debug\libmysqlutil.dll ..\bin\windows\libmysqlutil.dll
copy ..\library\Lib_Debug\libmysqladmin.dll ..\bin\windows\libmysqladmin.dll
if exist ..\bin\windows\msvcr71.dll del ..\bin\windows\msvcr71.dll
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesRelease.cmd mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesRelease.cmd
--- mysql-gui-tools-5.0r14-orig/administrator/build/CopyLibrariesRelease.cmd 2008-09-12 09:55:30.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/build/CopyLibrariesRelease.cmd 2009-08-31 22:54:59.000000000 -0500
@@ -2,8 +2,8 @@
@echo off
echo Building release libraries...
-copy ..\..\mysql-gui-common\library\Lib_Release\libmysqlx.dll ..\bin\windows\libmysqlx.dll
-copy ..\..\mysql-gui-common\library_util\Lib_Release\libmysqlutil.dll ..\bin\windows\libmysqlutil.dll
+copy ..\..\common\library\Lib_Release\libmysqlx.dll ..\bin\windows\libmysqlx.dll
+copy ..\..\common\library_util\Lib_Release\libmysqlutil.dll ..\bin\windows\libmysqlutil.dll
copy ..\library\Lib_Release\libmysqladmin.dll ..\bin\windows\libmysqladmin.dll
if exist ..\bin\windows\msvcr71d.dll del ..\bin\windows\msvcr71d.dll
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/configure.in mysql-gui-tools-5.0r14/administrator/configure.in
--- mysql-gui-tools-5.0r14-orig/administrator/configure.in 2009-08-31 22:33:39.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/configure.in 2009-08-31 22:54:59.000000000 -0500
@@ -20,10 +20,10 @@
# internal libraries
#
AC_CHECK_FILE(../common/library/base-library, [],
- AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program]))
+ AC_MSG_ERROR([common source tree must be present in the same directory as this program]))
-#AC_CHECK_FILE(../mysql-gui-common/source/linux/libmacommongui.a, [],
-# AC_MSG_ERROR([mysql-gui-common source tree must be compiled and present in the same directory as this program]))
+#AC_CHECK_FILE(../common/source/linux/libmacommongui.a, [],
+# AC_MSG_ERROR([common source tree must be compiled and present in the same directory as this program]))
#
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/extract_pot.sh mysql-gui-tools-5.0r14/administrator/extract_pot.sh
--- mysql-gui-tools-5.0r14-orig/administrator/extract_pot.sh 2008-09-12 09:57:41.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/extract_pot.sh 2009-08-31 22:55:02.000000000 -0500
@@ -2,7 +2,7 @@
FILES="glade_files.c source/linux/*c library/source/*c"
-python ../mysql-gui-common/tools/po_glade.py res/linux/*.glade > glade_files.c
+python ../common/tools/po_glade.py res/linux/*.glade > glade_files.c
xgettext --default-domain=mysql-administrator\
--add-comments --keyword=_ --keyword=N_ $FILES \
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/libmysqladmin.bdsproj mysql-gui-tools-5.0r14/administrator/library/libmysqladmin.bdsproj
--- mysql-gui-tools-5.0r14-orig/administrator/library/libmysqladmin.bdsproj 2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/libmysqladmin.bdsproj 2009-08-31 22:55:02.000000000 -0500
@@ -214,7 +214,7 @@
<property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\..\administrator-1.1\library\source"/>
<property category="win32.*.win32b.dcc32" name="option.I.arg.2" value="source"/>
<property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.dcc32" name="option.I.arg.4" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.J.enabled" value="0"/>
@@ -232,13 +232,13 @@
<property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\..\administrator-1.1\library\source"/>
<property category="win32.*.win32b.dcc32" name="option.O.arg.2" value="source"/>
<property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.dcc32" name="option.O.arg.4" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\..\administrator-1.1\library\source"/>
<property category="win32.*.win32b.dcc32" name="option.R.arg.2" value="source"/>
<property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.dcc32" name="option.R.arg.4" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\..\administrator-1.1\library\source"/>
@@ -252,7 +252,7 @@
<property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\..\administrator-1.1\library\source"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="source"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
<property category="win32.*.win32b.ilink32" name="container.SelectedWarnings.containerenabled" value="1"/>
@@ -291,7 +291,7 @@
<property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\..\administrator-1.1\library\source"/>
<property category="win32.*.win32b.ilink32" name="option.j.arg.2" value="source"/>
<property category="win32.*.win32b.ilink32" name="option.j.arg.3" value="V:\MySQL\administrator-1.2\library\source"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.4" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.ilink32" name="option.j.arg.4" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
<property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
<property category="win32.*.win32b.ilink32" name="option.l.arg.1" value="intermediate"/>
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/libmysqladmin_static.bdsproj mysql-gui-tools-5.0r14/administrator/library/libmysqladmin_static.bdsproj
--- mysql-gui-tools-5.0r14-orig/administrator/library/libmysqladmin_static.bdsproj 2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/libmysqladmin_static.bdsproj 2009-08-31 22:55:02.000000000 -0500
@@ -175,7 +175,7 @@
<property category="win32.*.win32b.dcc32" name="option.GS.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="source"/>
<property category="win32.*.win32b.dcc32" name="option.I.arg.2" value="D:\Work\MySQL\administrator\library"/>
- <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.J.enabled" value="0"/>
@@ -192,12 +192,12 @@
<property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="source"/>
<property category="win32.*.win32b.dcc32" name="option.O.arg.2" value="D:\Work\MySQL\administrator\library"/>
- <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="source"/>
<property category="win32.*.win32b.dcc32" name="option.R.arg.2" value="D:\Work\MySQL\administrator\library"/>
- <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>
<property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>
<property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="source"/>
@@ -209,7 +209,7 @@
<property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="source"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="D:\Work\MySQL\administrator\library"/>
- <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>
<property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>
<property category="win32.*.win32b.ilink32" name="container.SelectedWarnings.containerenabled" value="1"/>
@@ -231,7 +231,7 @@
<property category="win32.*.win32b.ilink32" name="option.aa.enabled" value="0"/>
<property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="0"/>
<property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>
- <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="V:\MySQL\mysql-gui-common\source\grtsh"/>
+ <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="V:\MySQL\common\source\grtsh"/>
<property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>
<property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>
<property category="win32.*.win32b.ilink32" name="option.m.enabled" value="0"/>
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibrary.sln mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.sln
--- mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibrary.sln 2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.sln 2009-08-31 22:55:02.000000000 -0500
@@ -4,12 +4,12 @@
{6FBC86A7-892F-47C5-B62E-7304AB98DA29} = {6FBC86A7-892F-47C5-B62E-7304AB98DA29}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLXLibrary", "..\..\mysql-gui-common\library\MySQLXLibrary.vcproj", "{6FBC86A7-892F-47C5-B62E-7304AB98DA29}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLXLibrary", "..\..\common\library\MySQLXLibrary.vcproj", "{6FBC86A7-892F-47C5-B62E-7304AB98DA29}"
ProjectSection(ProjectDependencies) = postProject
{142530C4-B184-4833-9A1A-F268B6E336A7} = {142530C4-B184-4833-9A1A-F268B6E336A7}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLUtilLibrary", "..\..\mysql-gui-common\library_util\MySQLUtilLibrary.vcproj", "{142530C4-B184-4833-9A1A-F268B6E336A7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLUtilLibrary", "..\..\common\library_util\MySQLUtilLibrary.vcproj", "{142530C4-B184-4833-9A1A-F268B6E336A7}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibraryTests.sln mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibraryTests.sln
--- mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibraryTests.sln 2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibraryTests.sln 2009-08-31 22:55:02.000000000 -0500
@@ -3,7 +3,7 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLXLibrary", "..\..\mysql-gui-common\library\MySQLXLibrary.vcproj", "{6FBC86A7-892F-47C5-B62E-7304AB98DA29}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MySQLXLibrary", "..\..\common\library\MySQLXLibrary.vcproj", "{6FBC86A7-892F-47C5-B62E-7304AB98DA29}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
diff -uNr mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibrary.vcproj mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.vcproj
--- mysql-gui-tools-5.0r14-orig/administrator/library/MySQLAdministratorLibrary.vcproj 2008-09-12 09:55:56.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/library/MySQLAdministratorLibrary.vcproj 2009-08-31 22:55:02.000000000 -0500
@@ -122,7 +122,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="include;"..\..\mysql-gui-common\library\include";"..\..\mysql-gui-common\library_util\include";"..\..\mysql-gui-common\library_util\shared_include";"..\..\mysql-gui-win-res\include";"..\..\mysql-gui-win-res\include\mysql";"..\..\mysql-gui-win-res\include\windows";"..\..\mysql-gui-win-res\include\libxml";"..\..\mysql-gui-win-res\include\glib-2.0";"..\..\mysql-gui-win-res\include\pcre""
+ AdditionalIncludeDirectories="include;"..\..\common\library\include";"..\..\common\library_util\include";"..\..\common\library_util\shared_include";"..\..\mysql-gui-win-res\include";"..\..\mysql-gui-win-res\include\mysql";"..\..\mysql-gui-win-res\include\windows";"..\..\mysql-gui-win-res\include\libxml";"..\..\mysql-gui-win-res\include\glib-2.0";"..\..\mysql-gui-win-res\include\pcre""
[...15286 lines suppressed...]
+ <Binary Id="NewBinary13" src="../../../common/setup/windows/resources/binary/binary13" />
+ <Binary Id="NewBinary14" src="../../../common/setup/windows/resources/binary/binary14" />
+ <Binary Id="NewBinary15" src="../../../common/setup/windows/resources/binary/binary15" />
+ <Binary Id="NewBinary16" src="../../../common/setup/windows/resources/binary/binary16" />
+ <Binary Id="NewBinary17" src="../../../common/setup/windows/resources/binary/binary17" />
+ <Binary Id="NewBinary18" src="../../../common/setup/windows/resources/binary/binary18" />
</Product>
</Wix>
diff -uNr mysql-gui-tools-5.0r14-orig/query-browser/source/linux/Makefile.am mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am
--- mysql-gui-tools-5.0r14-orig/query-browser/source/linux/Makefile.am 2009-08-31 22:33:39.000000000 -0500
+++ mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am 2009-08-31 22:54:30.000000000 -0500
@@ -35,10 +35,10 @@
INCLUDES=@GNOME_CFLAGS@ @MYSQL_CFLAGS@ @PCRE_CFLAGS@\
- -I$(top_srcdir)/../mysql-gui-common/source/linux\
- -I$(top_srcdir)/../mysql-gui-common/library/base-library/include\
- -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\
- -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\
+ -I$(top_srcdir)/../common/source/linux\
+ -I$(top_srcdir)/../common/library/base-library/include\
+ -I$(top_srcdir)/../common/library/utilities/shared_include\
+ -I$(top_srcdir)/../common/library/utilities/include\
-I$(top_srcdir)/library/include\
-I$(top_srcdir)/source/linux/gtksourceview\
-DPREFIX=\""$(PREFIX)"\"\
@@ -48,10 +48,10 @@
mysql_query_browser_bin_LDADD=$(top_builddir)/library/source/libqb.a\
- $(top_builddir)/../mysql-gui-common/source/linux/libqbcommongui.a\
- $(top_builddir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\
- $(top_builddir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\
- $(top_builddir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\
+ $(top_builddir)/../common/source/linux/libqbcommongui.a\
+ $(top_builddir)/../common/library/base-library/source/.libs/libmysqlx.a\
+ $(top_builddir)/../common/library/utilities/source/.libs/libguiutil.a\
+ $(top_builddir)/../common/library/sql-parser/source/.libs/libsqlparser.a\
$(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a\
@MYSQL_LIBS@ @GNOME_LIBS@ @PCRE_LIBS@
diff -uNr mysql-gui-tools-5.0r14-orig/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser
--- mysql-gui-tools-5.0r14-orig/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser 2006-09-11 09:07:23.000000000 -0500
+++ mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/kojima.pbxuser 2009-08-31 22:54:32.000000000 -0500
@@ -564,7 +564,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.objcpp;
name = MQResultSetView.mm;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/ResultSet/MQResultSetView.mm";
+ path = "/Users/kojima/Development/common/source/mac/ResultSet/MQResultSetView.mm";
sourceTree = "<absolute>";
};
2B1F35D908848FB700455FC3 /* PBXTextBookmark */ = {
@@ -1065,7 +1065,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MTableEditor.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/MTableEditor.m";
+ path = "/Users/kojima/Development/common/source/mac/MTableEditor.m";
sourceTree = "<absolute>";
};
2B682F030AB5A41400389BA0 /* PBXTextBookmark */ = {
@@ -1229,7 +1229,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MSourceLayoutManager.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/SourceEditor/MSourceLayoutManager.m";
+ path = "/Users/kojima/Development/common/source/mac/SourceEditor/MSourceLayoutManager.m";
sourceTree = "<absolute>";
};
2B8328AF085FE4CE00D8BEB0 /* PBXTextBookmark */ = {
@@ -1246,7 +1246,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MSourceLayoutManager.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/SourceEditor/MSourceLayoutManager.m";
+ path = "/Users/kojima/Development/common/source/mac/SourceEditor/MSourceLayoutManager.m";
sourceTree = "<absolute>";
};
2B8328BD085FE50000D8BEB0 /* PBXTextBookmark */ = {
@@ -1290,14 +1290,14 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.c;
name = myx_library.c;
- path = "/Users/kojima/Development/mysql-gui-common/library/source/myx_library.c";
+ path = "/Users/kojima/Development/common/library/source/myx_library.c";
sourceTree = "<absolute>";
};
2B8C4B2A083C158500A72366 /* MTableEditor.m */ = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MTableEditor.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/MTableEditor.m";
+ path = "/Users/kojima/Development/common/source/mac/MTableEditor.m";
sourceTree = "<absolute>";
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1140, 23988}}";
@@ -1319,7 +1319,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MSchemaDataSource.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/MSchemaDataSource.m";
+ path = "/Users/kojima/Development/common/source/mac/MSchemaDataSource.m";
sourceTree = "<absolute>";
};
2B8C4C34083C36C100A72366 /* PBXTextBookmark */ = {
@@ -1346,7 +1346,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MSchemaDataSource.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/MSchemaDataSource.m";
+ path = "/Users/kojima/Development/common/source/mac/MSchemaDataSource.m";
sourceTree = "<absolute>";
};
2B8C4CB1083C47EA00A72366 /* PBXTextBookmark */ = {
@@ -1435,7 +1435,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MTextImageCell.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/MTextImageCell.m";
+ path = "/Users/kojima/Development/common/source/mac/MTextImageCell.m";
sourceTree = "<absolute>";
};
2B8FAC6B082B8CA600D63986 /* PBXTextBookmark */ = {
@@ -1452,7 +1452,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MTextImageCell.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/MTextImageCell.m";
+ path = "/Users/kojima/Development/common/source/mac/MTextImageCell.m";
sourceTree = "<absolute>";
};
2B8FB08E082D704100D63986 /* MQRSSearchPanel.h */ = {
@@ -1810,7 +1810,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MMenuButton.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/MMenuButton.m";
+ path = "/Users/kojima/Development/common/source/mac/MMenuButton.m";
sourceTree = "<absolute>";
};
2BB542490858A8D8007DA3B2 /* PBXTextBookmark */ = {
@@ -2620,7 +2620,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.objc;
name = MSyntaxColoring.m;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/SourceEditor/MSyntaxColoring.m";
+ path = "/Users/kojima/Development/common/source/mac/SourceEditor/MSyntaxColoring.m";
sourceTree = "<absolute>";
};
2BDF71BF08E0A43900088236 /* PBXTextBookmark */ = {
@@ -2637,7 +2637,7 @@
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.objcpp;
name = MQResultSetView.mm;
- path = "/Users/kojima/Development/mysql-gui-common/source/mac/ResultSet/MQResultSetView.mm";
+ path = "/Users/kojima/Development/common/source/mac/ResultSet/MQResultSetView.mm";
sourceTree = "<absolute>";
};
2BE8B26C0815F81C00E73770 /* MQHistory.h */ = {
diff -uNr mysql-gui-tools-5.0r14-orig/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj
--- mysql-gui-tools-5.0r14-orig/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj 2006-12-13 08:11:59.000000000 -0600
+++ mysql-gui-tools-5.0r14/query-browser/source/mac/MySQL QueryBrowser.xcodeproj/project.pbxproj 2009-08-31 22:54:32.000000000 -0500
@@ -331,7 +331,7 @@
2B8FA936082A73F900D63986 /* sbar_unsplitv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sbar_unsplitv.png; path = ../../images/png/sbar_unsplitv.png; sourceTree = SOURCE_ROOT; };
2B8FB08E082D704100D63986 /* MQRSSearchPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MQRSSearchPanel.h; sourceTree = "<group>"; };
2B8FB08F082D704100D63986 /* MQRSSearchPanel.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MQRSSearchPanel.m; sourceTree = "<group>"; };
- 2B8FB093082D706400D63986 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = "../../../mysql-gui-common/res/mac/English.lproj/RSSearchPanel.nib"; sourceTree = SOURCE_ROOT; };
+ 2B8FB093082D706400D63986 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = "../../../common/res/mac/English.lproj/RSSearchPanel.nib"; sourceTree = SOURCE_ROOT; };
2B8FB4EB0830EEDE00D63986 /* tabsheet_icon_inlinehelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_inlinehelp.png; path = ../../images/png/tabsheet_icon_inlinehelp.png; sourceTree = SOURCE_ROOT; };
2B8FB4EC0830EEDE00D63986 /* tabsheet_icon_resultset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_resultset.png; path = ../../images/png/tabsheet_icon_resultset.png; sourceTree = SOURCE_ROOT; };
2B8FB4ED0830EEDE00D63986 /* tabsheet_icon_script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = tabsheet_icon_script.png; path = ../../images/png/tabsheet_icon_script.png; sourceTree = SOURCE_ROOT; };
@@ -353,8 +353,8 @@
2B8FB83708342EB000D63986 /* rs_search_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_search_disabled.png; path = ../../images/png/rs_search_disabled.png; sourceTree = SOURCE_ROOT; };
2B8FB83808342EB000D63986 /* rs_search.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_search.png; path = ../../images/png/rs_search.png; sourceTree = SOURCE_ROOT; };
2B8FB83908342EB000D63986 /* rs_warning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = rs_warning.png; path = ../../images/png/rs_warning.png; sourceTree = SOURCE_ROOT; };
- 2B8FB8670834308A00D63986 /* 16x16_Catalog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Catalog.png; path = "../../../mysql-gui-common/images/png/16x16_Catalog.png"; sourceTree = SOURCE_ROOT; };
- 2B8FB875083430D100D63986 /* 16x16_Field.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Field.png; path = "../../../mysql-gui-common/images/png/16x16_Field.png"; sourceTree = SOURCE_ROOT; };
+ 2B8FB8670834308A00D63986 /* 16x16_Catalog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Catalog.png; path = "../../../common/images/png/16x16_Catalog.png"; sourceTree = SOURCE_ROOT; };
+ 2B8FB875083430D100D63986 /* 16x16_Field.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_Field.png; path = "../../../common/images/png/16x16_Field.png"; sourceTree = SOURCE_ROOT; };
2B9973360A64A03E00649D58 /* libintl.3.4.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libintl.3.4.3.dylib; path = /Users/vlad/sw/lib/libintl.3.4.3.dylib; sourceTree = "<absolute>"; };
2B9973BC0A64AF0200649D58 /* libglib-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libglib-2.0.0.dylib"; path = "/uni/lib/libglib-2.0.0.dylib"; sourceTree = "<absolute>"; };
2B9C8E710853B05900C16483 /* MQHelpTab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQHelpTab.h; sourceTree = "<group>"; };
@@ -402,11 +402,11 @@
2BC7D7E807F47A7100CB83E9 /* MQBookmark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQBookmark.m; sourceTree = "<group>"; };
2BC9F969085F7A6F00949574 /* MQPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MQPreferences.h; sourceTree = "<group>"; };
2BC9F96A085F7A6F00949574 /* MQPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MQPreferences.m; sourceTree = "<group>"; };
- 2BCEDE3807DBFC9400F9482E /* 16x16_KeyColumn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_KeyColumn.png; path = "../../../mysql-gui-common/images/png/16x16_KeyColumn.png"; sourceTree = SOURCE_ROOT; };
- 2BCEDE4507DBFCBF00F9482E /* myx_schema_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_16x16.png"; sourceTree = SOURCE_ROOT; };
- 2BCEDE4607DBFCBF00F9482E /* myx_schema_sp_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_sp_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_sp_16x16.png"; sourceTree = SOURCE_ROOT; };
- 2BCEDE4707DBFCBF00F9482E /* myx_schema_table_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_table_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_table_16x16.png"; sourceTree = SOURCE_ROOT; };
- 2BCEDE4807DBFCBF00F9482E /* myx_schema_view_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_view_16x16.png; path = "../../../mysql-gui-common/images/icons/png/myx_schema_view_16x16.png"; sourceTree = SOURCE_ROOT; };
+ 2BCEDE3807DBFC9400F9482E /* 16x16_KeyColumn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 16x16_KeyColumn.png; path = "../../../common/images/png/16x16_KeyColumn.png"; sourceTree = SOURCE_ROOT; };
+ 2BCEDE4507DBFCBF00F9482E /* myx_schema_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_16x16.png; path = "../../../common/images/icons/png/myx_schema_16x16.png"; sourceTree = SOURCE_ROOT; };
+ 2BCEDE4607DBFCBF00F9482E /* myx_schema_sp_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_sp_16x16.png; path = "../../../common/images/icons/png/myx_schema_sp_16x16.png"; sourceTree = SOURCE_ROOT; };
+ 2BCEDE4707DBFCBF00F9482E /* myx_schema_table_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_table_16x16.png; path = "../../../common/images/icons/png/myx_schema_table_16x16.png"; sourceTree = SOURCE_ROOT; };
+ 2BCEDE4807DBFCBF00F9482E /* myx_schema_view_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = myx_schema_view_16x16.png; path = "../../../common/images/icons/png/myx_schema_view_16x16.png"; sourceTree = SOURCE_ROOT; };
2BD9ABF4085E417E00DF65E9 /* mysqlqb_functions.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = mysqlqb_functions.xml; path = ../../res/mysqlqb_functions.xml; sourceTree = SOURCE_ROOT; };
2BD9ABF5085E417E00DF65E9 /* mysqlqb_statements.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = mysqlqb_statements.xml; path = ../../res/mysqlqb_statements.xml; sourceTree = SOURCE_ROOT; };
2BD9AD7C085E701400DF65E9 /* mysqlqb_functions.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; name = mysqlqb_functions.html; path = ../../res/doc/mysqlqb_functions.html; sourceTree = SOURCE_ROOT; };
mysql-gui-tools-5.0r14-common.patch:
administrator/configure.in | 2 +-
query-browser/configure.in | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
--- NEW FILE mysql-gui-tools-5.0r14-common.patch ---
--- mysql-gui-tools-5.0r14/administrator/configure.in.BAD 2009-08-31 11:55:53.000000000 -0500
+++ mysql-gui-tools-5.0r14/administrator/configure.in 2009-08-31 11:56:57.000000000 -0500
@@ -19,7 +19,7 @@
#
# internal libraries
#
-AC_CHECK_FILE(../mysql-gui-common/library/base-library, [],
+AC_CHECK_FILE(../common/library/base-library, [],
AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program]))
#AC_CHECK_FILE(../mysql-gui-common/source/linux/libmacommongui.a, [],
--- mysql-gui-tools-5.0r14/query-browser/configure.in.BAD 2009-08-31 11:57:25.000000000 -0500
+++ mysql-gui-tools-5.0r14/query-browser/configure.in 2009-08-31 16:11:28.000000000 -0500
@@ -17,8 +17,8 @@
#
# internal libraries
#
-AC_CHECK_FILE(../mysql-gui-common/library/base-library/include,
- [MYSQLA_INCLUDE='-I$(top_srcdir)/../mysql-gui-common/library/base-library/include -I$(top_srcdir)/../mysql-gui-common/source/linux'],
+AC_CHECK_FILE(../common/library/base-library/include,
+ [MYSQLA_INCLUDE='-I$(top_srcdir)/../common/library/base-library/include -I$(top_srcdir)/../common/source/linux'],
AC_MSG_ERROR([mysql-gui-common source tree must be present in the same directory as this program]))
#AC_CHECK_FILE(../mysql-gui-common/source/linux/libqbcommongui.a, [],
@@ -73,6 +73,7 @@
PKG_CHECK_MODULES(GNOME, [libglade-2.0
gthread-2.0
libxml-2.0 >= 2.6.2
+ libgnome-2.0
$gtkhtml
gtkmm-2.4])
AC_SUBST(GNOME_CFLAGS)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 17 Jun 2007 18:42:28 -0000 1.3
+++ .cvsignore 1 Sep 2009 04:33:33 -0000 1.4
@@ -1 +1 @@
-mysql-gui-tools-5.0r12.tar.gz
+mysql-gui-tools-5.0r14.tar.gz
gtk_deprecated_typedefs.patch:
Makefile.in | 2 --
1 file changed, 2 deletions(-)
Index: gtk_deprecated_typedefs.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/gtk_deprecated_typedefs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtk_deprecated_typedefs.patch 15 Sep 2008 17:55:15 -0000 1.1
+++ gtk_deprecated_typedefs.patch 1 Sep 2009 04:33:33 -0000 1.2
@@ -1,6 +1,6 @@
-diff -NaurEbBH mysql-gui-tools-5.0r12.ORIG/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in
---- mysql-gui-tools-5.0r12.ORIG/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in 2008-09-15 03:03:13.000000000 +0400
-+++ mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in 2008-09-15 12:28:00.000000000 +0400
+diff -NaurEbBH mysql-gui-tools-5.0r14.ORIG/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in mysql-gui-tools-5.0r14/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in
+--- mysql-gui-tools-5.0r14.ORIG/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in 2008-09-15 03:03:13.000000000 +0400
++++ mysql-gui-tools-5.0r14/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in 2008-09-15 12:28:00.000000000 +0400
@@ -202,8 +202,6 @@
INCLUDES = \
-DDATADIR=\""$(datadir)"\" \
mysql-gui-tools-5.0_p12-gcc-4.3.patch:
common/source/linux/MGFileBrowserList.cc | 1 +
common/source/linux/MGHMeterGraphPlotter.cc | 1 +
query-browser/source/linux/MGCodeEditor.cc | 1 +
3 files changed, 3 insertions(+)
Index: mysql-gui-tools-5.0_p12-gcc-4.3.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools-5.0_p12-gcc-4.3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-gui-tools-5.0_p12-gcc-4.3.patch 8 Jul 2008 19:46:55 -0000 1.1
+++ mysql-gui-tools-5.0_p12-gcc-4.3.patch 1 Sep 2009 04:33:33 -0000 1.2
@@ -1,7 +1,7 @@
-Index: mysql-gui-common/source/linux/MGFileBrowserList.cc
+Index: common/source/linux/MGFileBrowserList.cc
===================================================================
---- mysql-gui-common/source/linux/MGFileBrowserList.cc (revision 2059)
-+++ mysql-gui-common/source/linux/MGFileBrowserList.cc (working copy)
+--- common/source/linux/MGFileBrowserList.cc (revision 2059)
++++ common/source/linux/MGFileBrowserList.cc (working copy)
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <sys/stat.h>
@@ -10,10 +10,10 @@ Index: mysql-gui-common/source/linux/MGF
#include <stdio.h> /* rename() in FreeBSD */
-Index: mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc
+Index: common/source/linux/MGHMeterGraphPlotter.cc
===================================================================
---- mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc (revision 2059)
-+++ mysql-gui-common/source/linux/MGHMeterGraphPlotter.cc (working copy)
+--- common/source/linux/MGHMeterGraphPlotter.cc (revision 2059)
++++ common/source/linux/MGHMeterGraphPlotter.cc (working copy)
@@ -16,6 +16,7 @@
@@ -22,10 +22,10 @@ Index: mysql-gui-common/source/linux/MGH
-Index: mysql-query-browser/source/linux/MGCodeEditor.cc
+Index: query-browser/source/linux/MGCodeEditor.cc
===================================================================
---- mysql-query-browser/source/linux/MGCodeEditor.cc (revision 476)
-+++ mysql-query-browser/source/linux/MGCodeEditor.cc (working copy)
+--- query-browser/source/linux/MGCodeEditor.cc (revision 476)
++++ query-browser/source/linux/MGCodeEditor.cc (working copy)
@@ -16,6 +16,7 @@
#include "MGCodeEditor.h"
mysql-gui-tools-5.0_p12-libsigc++-2.2.patch:
administrator/source/linux/MABackupPanel.cc | 2 +-
administrator/source/linux/MACatalogsPanel.cc | 6 +++---
administrator/source/linux/MARestorePanel.cc | 4 ++--
administrator/source/linux/MAServerConnectionsPanel.h | 2 +-
administrator/source/linux/MAdministrator.h | 2 +-
common/source/linux/MGConnectDialog.cc | 6 +++---
common/source/linux/MGTreeTooltip.h | 2 +-
migration-tool/source/linux/GRTEnvironment.cc | 2 +-
migration-tool/source/linux/GRTEnvironment.h | 4 ++--
migration-tool/source/linux/ObjectShell.cc | 6 +++---
new/mysql-gui-common/library/sql-parser/source/sed885efK |only
query-browser/source/linux/MQResultTab.h | 4 ++--
12 files changed, 20 insertions(+), 20 deletions(-)
Index: mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools-5.0_p12-libsigc++-2.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-gui-tools-5.0_p12-libsigc++-2.2.patch 8 Jul 2008 19:46:55 -0000 1.1
+++ mysql-gui-tools-5.0_p12-libsigc++-2.2.patch 1 Sep 2009 04:33:33 -0000 1.2
@@ -1,5 +1,5 @@
---- old/mysql-administrator/source/linux/MABackupPanel.cc
-+++ new/mysql-administrator/source/linux/MABackupPanel.cc
+--- old/administrator/source/linux/MABackupPanel.cc
++++ new/administrator/source/linux/MABackupPanel.cc
@@ -1282,7 +1282,7 @@
if (_inst->check_connection())
@@ -9,8 +9,8 @@
(sigc::mem_fun(*this, &MABackupPanel::update_backup_progress),&arg.pdata),
50);
dlg->show();
---- old/mysql-administrator/source/linux/MACatalogsPanel.cc
-+++ new/mysql-administrator/source/linux/MACatalogsPanel.cc
+--- old/administrator/source/linux/MACatalogsPanel.cc
++++ new/administrator/source/linux/MACatalogsPanel.cc
@@ -1488,7 +1488,7 @@
_maint_dlg_xml->get_button("next_button")->set_sensitive(false);
@@ -38,8 +38,8 @@
status= (MYX_TABLE_COMMAND_STATUSES*)
_data->get_instance()->perform_data_fetch3((MInstanceInfo::DataFetcher3)myx_repair_table,
---- old/mysql-administrator/source/linux/MAdministrator.h
-+++ new/mysql-administrator/source/linux/MAdministrator.h
+--- old/administrator/source/linux/MAdministrator.h
++++ new/administrator/source/linux/MAdministrator.h
@@ -66,7 +66,7 @@
sigc::signal0<void> _signal_prefs_changed;
@@ -49,8 +49,8 @@
bool pulse_progress();
void setup_sidebar();
---- old/mysql-administrator/source/linux/MARestorePanel.cc
-+++ new/mysql-administrator/source/linux/MARestorePanel.cc
+--- old/administrator/source/linux/MARestorePanel.cc
++++ new/administrator/source/linux/MARestorePanel.cc
@@ -728,7 +728,7 @@
op_aborted= false;
@@ -69,8 +69,8 @@
(sigc::mem_fun(*this, &MARestorePanel::update_status),&arg.pdata),
50);
---- old/mysql-administrator/source/linux/MAServerConnectionsPanel.h
-+++ new/mysql-administrator/source/linux/MAServerConnectionsPanel.h
+--- old/administrator/source/linux/MAServerConnectionsPanel.h
++++ new/administrator/source/linux/MAServerConnectionsPanel.h
@@ -87,7 +87,7 @@
Glib::RefPtr<Gdk::Pixbuf> _thread_icon;
@@ -81,8 +81,8 @@
int _current_page;
Only in new/mysql-gui-common/library/sql-parser/source: sed885efK
---- old/mysql-gui-common/source/linux/MGConnectDialog.cc
-+++ new/mysql-gui-common/source/linux/MGConnectDialog.cc
+--- old/common/source/linux/MGConnectDialog.cc
++++ new/common/source/linux/MGConnectDialog.cc
@@ -659,9 +659,9 @@
// select back the original item
((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
@@ -104,8 +104,8 @@ Only in new/mysql-gui-common/library/sql
int rc;
bool pinging= false;
int myerror= 0;
---- old/mysql-gui-common/source/linux/MGTreeTooltip.h
-+++ new/mysql-gui-common/source/linux/MGTreeTooltip.h
+--- old/common/source/linux/MGTreeTooltip.h
++++ new/common/source/linux/MGTreeTooltip.h
@@ -39,7 +39,7 @@
WillShowSignal _show_signal;
@@ -115,8 +115,8 @@ Only in new/mysql-gui-common/library/sql
void expose_event(GdkEventExpose *event);
void leave_event(GdkEventCrossing *event);
---- old/mysql-migration-tool/source/linux/GRTEnvironment.cc
-+++ new/mysql-migration-tool/source/linux/GRTEnvironment.cc
+--- old/migration-tool/source/linux/GRTEnvironment.cc
++++ new/migration-tool/source/linux/GRTEnvironment.cc
@@ -76,7 +76,7 @@
}
@@ -126,8 +126,8 @@ Only in new/mysql-gui-common/library/sql
{
_shellOutputHandler= slot;
---- old/mysql-migration-tool/source/linux/GRTEnvironment.h
-+++ new/mysql-migration-tool/source/linux/GRTEnvironment.h
+--- old/migration-tool/source/linux/GRTEnvironment.h
++++ new/migration-tool/source/linux/GRTEnvironment.h
@@ -28,7 +28,7 @@
int _msgOffset;
std::vector<Glib::ustring> _sourceObjectNames;
@@ -146,8 +146,8 @@ Only in new/mysql-gui-common/library/sql
MYX_GRT_OBJ *get_object(const Glib::ustring &name);
bool object_implements_interface(MYX_GRT_OBJ *obj, const Glib::ustring &name);
---- old/mysql-migration-tool/source/linux/ObjectShell.cc
-+++ new/mysql-migration-tool/source/linux/ObjectShell.cc
+--- old/migration-tool/source/linux/ObjectShell.cc
++++ new/migration-tool/source/linux/ObjectShell.cc
@@ -45,7 +45,7 @@
tree->set_model(_otree);
@@ -169,8 +169,8 @@ Only in new/mysql-gui-common/library/sql
put_prompt();
}
---- old/mysql-query-browser/source/linux/MQResultTab.h
-+++ new/mysql-query-browser/source/linux/MQResultTab.h
+--- old/query-browser/source/linux/MQResultTab.h
++++ new/query-browser/source/linux/MQResultTab.h
@@ -45,7 +45,7 @@
Gtk::Paned *paned;
mysql-gui-tools-5.0r12-DEBUG.patch:
mysql-administrator | 1 +
1 file changed, 1 insertion(+)
Index: mysql-gui-tools-5.0r12-DEBUG.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools-5.0r12-DEBUG.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-gui-tools-5.0r12-DEBUG.patch 15 Sep 2008 18:06:24 -0000 1.1
+++ mysql-gui-tools-5.0r12-DEBUG.patch 1 Sep 2009 04:33:33 -0000 1.2
@@ -1,5 +1,5 @@
---- mysql-gui-tools-5.0r12/mysql-administrator/source/linux/mysql-administrator.BAD 2008-09-08 08:32:19.000000000 -0500
-+++ mysql-gui-tools-5.0r12/mysql-administrator/source/linux/mysql-administrator 2008-09-08 08:32:36.000000000 -0500
+--- mysql-gui-tools-5.0r14/administrator/source/linux/mysql-administrator.BAD 2008-09-08 08:32:19.000000000 -0500
++++ mysql-gui-tools-5.0r14/administrator/source/linux/mysql-administrator 2008-09-08 08:32:36.000000000 -0500
@@ -1,6 +1,7 @@
#!/bin/sh
mysql-gui-tools-gtksourceview-cflags.patch:
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mysql-gui-tools-gtksourceview-cflags.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools-gtksourceview-cflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-gui-tools-gtksourceview-cflags.patch 8 Jul 2008 19:46:55 -0000 1.1
+++ mysql-gui-tools-gtksourceview-cflags.patch 1 Sep 2009 04:33:34 -0000 1.2
@@ -1,14 +1,11 @@
---- mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/Makefile.in.BAD 2008-07-08 11:20:21.000000000 -0500
-+++ mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/Makefile.in 2008-07-08 13:25:34.000000000 -0500
-@@ -102,9 +102,9 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -D_GNU_SOURCE
- CPP = @CPP@
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -D_GNU_SOURCE
- CXX = @CXX@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
+--- mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am.BAD 2009-08-31 11:23:41.000000000 -0500
++++ mysql-gui-tools-5.0r14/query-browser/source/linux/Makefile.am 2009-08-31 11:24:01.000000000 -0500
+@@ -61,7 +61,7 @@
+ # If a solution is found, this could be removed.
+ #
+ $(top_builddir)/source/linux/gtksourceview/gtksourceview/.libs/libgtksourceview-1.0.a:
+- (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -fno-strict-aliasing")
++ (cd gtksourceview; ./configure --enable-static --disable-shared --disable-build-tests; make CFLAGS="$(CFLAGS) -D_GNU_SOURCE -fno-strict-aliasing")
+
+ clean-generic:
+ -make -C gtksourceview distclean
Index: mysql-gui-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-gui-tools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- mysql-gui-tools.spec 21 Aug 2009 14:35:30 -0000 1.14
+++ mysql-gui-tools.spec 1 Sep 2009 04:33:34 -0000 1.15
@@ -1,6 +1,6 @@
Name: mysql-gui-tools
-Version: 5.0r12
-Release: 13%{?dist}
+Version: 5.0r14
+Release: 1%{?dist}
Summary: GUI tools to manage mysql Databases
Group: Applications/Databases
@@ -9,18 +9,21 @@ URL: http://www.mysql.com/pro
Source0: http://dev.mysql.com/get/Downloads/MySQLAdministrationSuite/mysql-gui-tools-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: mysql-gui-tools-5.0r12-DEBUG.patch
-Patch1: mysql-query-browser-default_schema_infinite_loop.patch
-Patch2: mysql-gui-tools-5.0_p12-gcc-4.3.patch
+Patch1: mysql-query-browser-default_schema_infinite_loop.patch
+Patch2: mysql-gui-tools-5.0_p12-gcc-4.3.patch
Patch3: mysql-gui-tools-5.0_p12-libsigc++-2.2.patch
Patch4: mysql-gui-tools-gtksourceview-cflags.patch
-Patch5: gtk_deprecated_typedefs.patch
+Patch5: mysql-gui-tools-5.0r14-common.patch
+Patch6: gtk_deprecated_typedefs.patch
+Patch7: mysql-gui-tools-5.0r14-common-cleanup.patch
BuildRequires: libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
BuildRequires: openssl-devel, gtkhtml3-devel, desktop-file-utils, gettext
BuildRequires: mesa-libGLU-devel, python-devel, autoconf, automake
-BuildRequires: libtool, expat-devel, readline-devel
-BuildRequires: libgnomeprint22-devel
+BuildRequires: libtool, expat-devel, readline-devel, perl-devel
+BuildRequires: libgnomeprint22-devel, libgnome-devel
BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: automake autoconf perl(XML::Parser)
Requires: mysql-administrator, mysql-query-browser
@@ -74,13 +77,31 @@ at runtime
%patch3 -p1 -b .sigc++
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
+#ln -s administrator mysql-administrator
+#ln -s common mysql-gui-common
+#ln -s migration-tool mysql-migration-tool
+#ln -s query-browser mysql-query-browser
+
+# rpmlint complains that the debuginfo packages have a bunch of files with wrong eol
+# and executeable perms lets use a hammer and fix it
+find . -name "*.h" -exec chmod 644 {} \;
+find . -name "*.h" -exec sed -i 's/\r//' {} \;
+find . -name "*.cc" -exec chmod 644 {} \;
+find . -name "*.cc" -exec sed -i 's/\r//' {} \;
+find . -name "*.c" -exec chmod 644 {} \;
+find . -name "*.c" -exec sed -i 's/\r//' {} \;
+find . -name "*.cpp" -exec chmod 644 {} \;
+find . -name "*.cpp" -exec sed -i 's/\r//' {} \;
%build
-pushd mysql-gui-common
+pushd common
+sh autogen.sh
%configure --enable-php-modules \
--enable-python-modules \
--enable-readline \
- --with-bonobo \
%ifarch x86_64 ppc64 sparc64
--with-java-includes=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.%{_arch}/include
%else
@@ -89,40 +110,41 @@ pushd mysql-gui-common
make %{?_smp_mflags}
popd
-pushd mysql-administrator
-%configure --with-bonobo
+pushd administrator
+sh autogen.sh
+%configure
make %{?_smp_mflags}
popd
-pushd mysql-query-browser
-%configure --with-gtkhtml=libgtkhtml-3.14 \
- --with-bonobo
+pushd query-browser
+sh autogen.sh --with-gtkhtml=libgtkhtml-3.14
+%configure --with-gtkhtml=libgtkhtml-3.14
make %{?_smp_mflags}
popd
%install
rm -rf $RPM_BUILD_ROOT
-pushd mysql-gui-common
+pushd common
chmod 644 COPYING README
make install DESTDIR=$RPM_BUILD_ROOT
popd
-pushd mysql-administrator
+pushd administrator
chmod 644 COPYING
make install DESTDIR=$RPM_BUILD_ROOT
popd
-pushd mysql-query-browser
+pushd query-browser
chmod 644 COPYING
make install DESTDIR=$RPM_BUILD_ROOT
popd
-# MySQL use dos new line characters that desktop file install doesnt like
-# MySQL also use dos new line endings in there documantation files rpmlint didint like them
+# MySQL use dos new line characters that desktop-file-install doesn't like
+# MySQL also use dos new line endings in there documantation files rpmlint didn't like them
sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLQueryBrowser.desktop
-sed -i 's/\r//' mysql-administrator/COPYING mysql-gui-common/COPYING mysql-gui-common/README
-sed -i 's/\r//' mysql-query-browser/COPYING
+sed -i 's/\r//' administrator/COPYING common/COPYING common/README
+sed -i 's/\r//' query-browser/COPYING
desktop-file-install --vendor=fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -150,11 +172,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc mysql-administrator/COPYING
+%doc administrator/COPYING
%files -n mysql-administrator -f mysql-administrator.lang
%defattr(-,root,root,-)
-%doc mysql-administrator/COPYING
+%doc administrator/COPYING
%{_bindir}/mabackup
%{_bindir}/mysql-administrator
%{_bindir}/mysql-administrator-bin
@@ -164,13 +186,13 @@ rm -rf $RPM_BUILD_ROOT
%files -n mysql-gui-common
%defattr(-,root,root,-)
-%doc mysql-gui-common/COPYING mysql-gui-common/README
+%doc gui-common/COPYING common/README
%dir %{_datadir}/mysql-gui
%{_datadir}/mysql-gui/common
%files -n mysql-query-browser -f mysql-query-browser.lang
%defattr(-,root,root,-)
-%doc mysql-query-browser/COPYING
+%doc query-browser/COPYING
%{_bindir}/mysql-query-browser*
%{_datadir}/applications/fedora-MySQLQueryBrowser.desktop
%{_datadir}/mysql-gui/query-browser
@@ -178,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 31 2009 Dennis Gilmore <dennis at ausil.us> - 5.0r14-1
+- update to 5.0r14
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 5.0r12-13
- rebuilt with new openssl
mysql-query-browser-default_schema_infinite_loop.patch:
MQQueryDispatcher.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: mysql-query-browser-default_schema_infinite_loop.patch
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/mysql-query-browser-default_schema_infinite_loop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mysql-query-browser-default_schema_infinite_loop.patch 27 Nov 2007 22:33:46 -0000 1.1
+++ mysql-query-browser-default_schema_infinite_loop.patch 1 Sep 2009 04:33:34 -0000 1.2
@@ -1,6 +1,6 @@
-diff -uNr mysql-gui-tools-5.0r12_orig/mysql-query-browser/source/linux/MQQueryDispatcher.cc mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/MQQueryDispatcher.cc
---- mysql-gui-tools-5.0r12_orig/mysql-query-browser/source/linux/MQQueryDispatcher.cc 2007-04-27 09:11:32.000000000 -0400
-+++ mysql-gui-tools-5.0r12/mysql-query-browser/source/linux/MQQueryDispatcher.cc 2007-10-06 10:40:45.000000000 -0400
+diff -uNr mysql-gui-tools-5.0r14_orig/query-browser/source/linux/MQQueryDispatcher.cc mysql-gui-tools-5.0r14/query-browser/source/linux/MQQueryDispatcher.cc
+--- mysql-gui-tools-5.0r14_orig/query-browser/source/linux/MQQueryDispatcher.cc 2007-04-27 09:11:32.000000000 -0400
++++ mysql-gui-tools-5.0r14/query-browser/source/linux/MQQueryDispatcher.cc 2007-10-06 10:40:45.000000000 -0400
@@ -558,8 +558,8 @@
Gtk::Main::instance()->run();
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-gui-tools/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 17 Jun 2007 18:42:28 -0000 1.3
+++ sources 1 Sep 2009 04:33:34 -0000 1.4
@@ -1 +1 @@
-755a62e8cd0ea0e138be6eedc430d7a9 mysql-gui-tools-5.0r12.tar.gz
+b8efefbf20b7264c8f3afd34424467d7 mysql-gui-tools-5.0r14.tar.gz
More information about the scm-commits
mailing list