openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2009
- 1 participants
- 754 discussions
Hello community,
here is the log from the commit of package OpenOffice_org-artwork for openSUSE:Factory
checked in at Fri May 22 00:07:00 CEST 2009.
--------
--- OpenOffice_org-artwork/OpenOffice_org-artwork.changes 2009-05-15 17:57:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/OpenOffice_org-artwork/OpenOffice_org-artwork.changes 2009-05-19 17:00:26.000000000 +0200
@@ -1,0 +2,5 @@
+Tue May 19 16:30:15 CEST 2009 - pmladek(a)suse.cz
+
+- updated ooo-build to version 3.1.0.2 (3.1-rc3)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org-artwork.spec ++++++
--- /var/tmp/diff_new_pack.r23791/_old 2009-05-22 00:06:52.000000000 +0200
+++ /var/tmp/diff_new_pack.r23791/_new 2009-05-22 00:06:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package OpenOffice_org-artwork (Version 3.1.0.1)
+# spec file for package OpenOffice_org-artwork (Version 3.1.0.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,9 +19,9 @@
Name: OpenOffice_org-artwork
-Version: 3.1.0.1
+Version: 3.1.0.2
Release: 1
-%define ooo_build_version 3.1.0.1
+%define ooo_build_version 3.1.0.2
%define piece artwork
#!BuildIgnore: OpenOffice_org
BuildRequires: OpenOffice_org-bootstrap = %version
@@ -95,6 +95,8 @@
%defattr(-,root,root)
%changelog
+* Tue May 19 2009 pmladek(a)suse.cz
+- updated ooo-build to version 3.1.0.2 (3.1-rc3)
* Fri May 15 2009 pmladek(a)suse.cz
- updated ooo-build to version 3.1.0.1 (3.1-rc2)
* Thu May 07 2009 pmladek(a)suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at Fri May 22 00:06:37 CEST 2009.
--------
--- mysql-workbench/mysql-workbench.changes 2009-02-20 18:19:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench.changes 2009-05-19 14:55:48.000000000 +0200
@@ -1,0 +2,17 @@
+Tue May 19 14:55:10 CEST 2009 - mhrusecky(a)suse.cz
+
+- fixed gcc 4.4 compilation errors
+
+-------------------------------------------------------------------
+Fri May 15 18:32:38 CEST 2009 - mhrusecky(a)suse.cz
+
+- updated to the version 5.1.12 (no release notes available)
+ - using new version of ctemplates correctly
+ - added return statements to non-void functions
+
+-------------------------------------------------------------------
+Thu Apr 21 18:07:47 CEST 2009 - mhrusecky(a)suse.cz
+
+- updated to the version 5.1.10 (no release notes available)
+
+-------------------------------------------------------------------
@@ -4 +21 @@
-- updated to the last version (5.1.7) (no release notes available)
+- updated to the version 5.1.7 (no release notes available)
calling whatdependson for head-i586
Old:
----
mysql-workbench-5.1.5-alpha-title.patch
mysql-workbench-5.1.5-lib-and-data-path-fix.patch
mysql-workbench-5.1.5-nochdir-save.patch
mysql-workbench-5.1.7-alpha-warning.patch
mysql-workbench-5.1.7-disable-bundled.patch
mysql-workbench-5.1.7-noext.tar.bz2
New:
----
mysql-workbench-5.1.10-alpha-title.patch
mysql-workbench-5.1.10-alpha-warning.patch
mysql-workbench-5.1.10-lib-and-data-path-fix.patch
mysql-workbench-5.1.12-code-cleanup.patch
mysql-workbench-5.1.12-disable-bundled.patch
mysql-workbench-5.1.12-gcc-44.patch
mysql-workbench-noext-oss-5.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-workbench.spec ++++++
--- /var/tmp/diff_new_pack.Zi8953/_old 2009-05-22 00:02:24.000000000 +0200
+++ /var/tmp/diff_new_pack.Zi8953/_new 2009-05-22 00:02:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mysql-workbench (Version 5.1.7)
+# spec file for package mysql-workbench (Version 5.1.12)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,28 +20,35 @@
Name: mysql-workbench
Summary: A MySQL visual modeling tool
-Version: 5.1.7
+Version: 5.1.12
Release: 1
Group: Productivity/Databases/Clients
License: GPL v2 or later
Url: http://www.mysql.com/products/tools/query-browser/
-Source: %{name}-%{version}-noext.tar.bz2
-Patch1: %{name}-5.1.7-disable-bundled.patch
+# Upstream tarball without ext directory (rm -rf ext)
+Source: %{name}-noext-oss-%{version}.tar.bz2
+Patch1: %{name}-5.1.12-disable-bundled.patch
Patch2: %{name}-5.1.5-desktop.patch
-Patch4: %{name}-5.1.5-lib-and-data-path-fix.patch
-Patch5: %{name}-5.1.5-nochdir-save.patch
+Patch4: %{name}-5.1.10-lib-and-data-path-fix.patch
Patch6: %{name}-5.1.5-silent-mode-without-debug.patch
-Patch7: %{name}-5.1.5-alpha-title.patch
-Patch8: %{name}-5.1.7-alpha-warning.patch
+Patch7: %{name}-5.1.10-alpha-title.patch
+Patch8: %{name}-5.1.10-alpha-warning.patch
+# PATCH-FIX-UPSTREAM mysql-workbench-5.1.12-code-cleanup.patch [ upstream#44906 ] mhrusecky(a)suse.cz -- Adds missing return statements to non-void functions
+# http://bugs.mysql.com/44906
+Patch9: %{name}-5.1.12-code-cleanup.patch
+# PATCH-FIX-UPSTREAM mysql-workbench-5.1.12-gcc-44.patch [] mhrusecky(a)suse.cz -- Adds missing includes
+#
+Patch10: %{name}-5.1.12-gcc-44.patch
Summary: A MySQL visual modeling tool
Group: Productivity/Databases/Clients
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: boost-devel gcc-c++ lua-devel
-BuildRequires: glib2-devel libctemplate-devel libscintilla-devel libsigc++2-devel libxml2-devel mysql-devel
+BuildRequires: glib2-devel libscintilla-devel libsigc++2-devel libxml2-devel mysql-devel
BuildRequires: FastCGI-devel java-devel libgnome-devel libzip-devel pcre-devel python-devel readline-devel
-BuildRequires: Mesa-devel cairomm-devel glitz-devel gtkmm24-devel libglade2-devel php-devel
+BuildRequires: Mesa-devel cairomm-devel glitz-devel gtkmm24-devel libglade2-devel libmysqlcppconn-devel php-devel
BuildRequires: dos2unix fdupes update-desktop-files
BuildRequires: cairo-devel >= 1.5.12
+BuildRequires: libctemplate-devel
%description
MySQL Workbench is modeling tool that allows you to design and generate
@@ -53,18 +60,18 @@
%prep
-%setup -q -n %{name}-oss-%{version}
-%patch1 -p1
+%setup -q -n %{name}-noext-oss-%{version}
+%patch1
%patch2
-%patch4
-#%patch5
+%patch4 -p1
%patch6
-%patch7
+%patch7 -p1
%patch8 -p1
-# remove bundled libraries
+%patch9
+%patch10
+# remove bundled libraries (not present in modified tarball)
rm -rf ext
# other small fixes
-mv frontend/linux/workbench/mysql-workbench frontend/linux/workbench/mysql-workbench.in
touch po/POTFILES.in
%build
@@ -110,8 +117,16 @@
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Tue May 19 2009 mhrusecky(a)suse.cz
+- fixed gcc 4.4 compilation errors
+* Fri May 15 2009 mhrusecky(a)suse.cz
+- updated to the version 5.1.12 (no release notes available)
+ - using new version of ctemplates correctly
+ - added return statements to non-void functions
+* Tue Apr 21 2009 mhrusecky(a)suse.cz
+- updated to the version 5.1.10 (no release notes available)
* Fri Feb 20 2009 mhrusecky(a)suse.cz
-- updated to the last version (5.1.7) (no release notes available)
+- updated to the version 5.1.7 (no release notes available)
* Tue Jan 20 2009 mhrusecky(a)suse.cz
- fixed file saving (not using chdir anymore)
- added big warning about alpha version
++++++ mysql-workbench-5.1.5-alpha-title.patch -> mysql-workbench-5.1.10-alpha-title.patch ++++++
--- mysql-workbench/mysql-workbench-5.1.5-alpha-title.patch 2009-01-19 17:21:32.000000000 +0100
+++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-5.1.10-alpha-title.patch 2009-04-17 21:40:42.000000000 +0200
@@ -1,12 +1,14 @@
---- backend/workbench/wb_context_ui.cpp
-+++ backend/workbench/wb_context_ui.cpp
-@@ -1121,9 +1121,9 @@
- std::string WBContextUI::get_title()
+diff -Naru mysql-workbench-oss-5.1.10-bak//backend/wbprivate/workbench/wb_context_ui.cpp mysql-workbench-oss-5.1.10/backend/wbprivate/workbench/wb_context_ui.cpp
+--- mysql-workbench-oss-5.1.10-bak//backend/wbprivate/workbench/wb_context_ui.cpp 2009-04-14 21:20:14.000000000 +0200
++++ mysql-workbench-oss-5.1.10/backend/wbprivate/workbench/wb_context_ui.cpp 2009-04-17 17:08:05.000000000 +0200
+@@ -1186,10 +1186,10 @@
{
+ #ifndef __APPLE__
if (_wb->has_unsaved_changes())
- return get_document_name() + "* - MySQL Workbench";
+ return get_document_name() + "* - MySQL Workbench - Alpha Version !!!";
else
+ #endif
- return get_document_name() + " - MySQL Workbench";
+ return get_document_name() + " - MySQL Workbench - Alpha Version !!!";
}
++++++ mysql-workbench-5.1.7-alpha-warning.patch -> mysql-workbench-5.1.10-alpha-warning.patch ++++++
--- mysql-workbench/mysql-workbench-5.1.7-alpha-warning.patch 2009-02-12 15:02:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-5.1.10-alpha-warning.patch 2009-04-21 18:07:33.000000000 +0200
@@ -1,10 +1,10 @@
-diff -Naru mysql-workbench-oss-5.1.7-bak/backend/workbench/wb_context.cpp mysql-workbench-oss-5.1.7/backend/workbench/wb_context.cpp
---- mysql-workbench-oss-5.1.7-bak/backend/workbench/wb_context.cpp 2009-02-12 14:07:34.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/backend/workbench/wb_context.cpp 2009-02-12 14:07:34.000000000 +0100
-@@ -478,6 +478,13 @@
+diff -Naru mysql-workbench-oss-5.1.10-bak//backend/wbprivate/workbench/wb_context.cpp mysql-workbench-oss-5.1.10/backend/wbprivate/workbench/wb_context.cpp
+--- mysql-workbench-oss-5.1.10-bak//backend/wbprivate/workbench/wb_context.cpp 2009-04-14 21:20:14.000000000 +0200
++++ mysql-workbench-oss-5.1.10/backend/wbprivate/workbench/wb_context.cpp 2009-04-17 17:14:14.000000000 +0200
+@@ -538,6 +538,14 @@
+ else
new_document();
- show_status_text(_("Ready."));
+ if (get_wb_options().get_int("workbench.AlphaWarning", 1))
+ this->show_warning(_("Alpha Version"),_("This version of the MySQL Workbench is an alpha version. "
+ "This means that not all functionality is yet completed and that the tool may still suffer from "
@@ -12,27 +12,29 @@
+ "Before you proceed please make sure you have a backup of ALL your databases so you do not lose "
+ "any importand data.\n\n"
+ "You can disable this warning in Tool->Options"));
-
- return true;
- }
-@@ -752,6 +759,7 @@
++
+ block_user_interaction(false);
+
+ show_status_text(_("Ready."));
+@@ -817,6 +825,7 @@
set_default(options, "workbench:OSSHideMissing", 0);
- set_default(options, "workbench:UndoEntries", 0);
+ set_default(options, "workbench:UndoEntries", DEFAULT_UNDO_STACK_SIZE);
set_default(options, "workbench.AutoReopenLastModel", 0);
+ set_default(options, "workbench.AlphaWarning", 1);
set_default(options, "workbench.physical:DeleteObjectConfirmation", "ask");
-diff -Naru mysql-workbench-oss-5.1.7-bak/frontend/common/preferences_form.cpp mysql-workbench-oss-5.1.7/frontend/common/preferences_form.cpp
---- mysql-workbench-oss-5.1.7-bak/frontend/common/preferences_form.cpp 2009-02-12 14:07:34.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/frontend/common/preferences_form.cpp 2009-02-12 14:07:34.000000000 +0100
-@@ -299,6 +299,9 @@
- mforms::CheckBox *check= new_checkbox_option("workbench.AutoReopenLastModel");
- check->set_text(_("Automatically Reopen Previous Model When Started"));
- table->add(check, 1, 2, 1, 2, mforms::HFillFlag);
-+ check= new_checkbox_option("workbench.AlphaWarning");
+diff -Naru mysql-workbench-oss-5.1.10-bak//frontend/common/preferences_form.cpp mysql-workbench-oss-5.1.10/frontend/common/preferences_form.cpp
+--- mysql-workbench-oss-5.1.10-bak//frontend/common/preferences_form.cpp 2009-04-14 21:20:14.000000000 +0200
++++ mysql-workbench-oss-5.1.10/frontend/common/preferences_form.cpp 2009-04-17 17:13:03.000000000 +0200
+@@ -366,7 +366,10 @@
+
+
+ table->add(new_label(_("Interactive GRT Shell Language:"), true), 0, 1, 2, 3, mforms::HFillFlag);
+ table->add(hbox, 1, 2, 2, 3, mforms::HFillFlag);
++ mforms::CheckBox *check= new_checkbox_option("workbench.AlphaWarning");
+ check->set_text(_("Warn About Alpha Version When Started"));
-+ table->add(check, 1, 2, 2, 3, mforms::HFillFlag);
++ table->add(check, 0, 2, 3, 4, mforms::HFillFlag);
}
_tabview.add_page(table, _("General"));
++++++ mysql-workbench-5.1.5-lib-and-data-path-fix.patch -> mysql-workbench-5.1.10-lib-and-data-path-fix.patch ++++++
--- mysql-workbench/mysql-workbench-5.1.5-lib-and-data-path-fix.patch 2009-01-14 16:05:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-5.1.10-lib-and-data-path-fix.patch 2009-04-17 21:40:50.000000000 +0200
@@ -1,36 +1,23 @@
---- configure.in
-+++ configure.in
-@@ -416,6 +416,7 @@
+diff -Naru mysql-workbench-oss-5.1.10-bak//configure.in mysql-workbench-oss-5.1.10/configure.in
+--- mysql-workbench-oss-5.1.10-bak//configure.in 2009-04-14 21:20:15.000000000 +0200
++++ mysql-workbench-oss-5.1.10/configure.in 2009-04-14 21:27:50.000000000 +0200
+@@ -400,6 +400,7 @@
frontend/linux/shell/Makefile
frontend/linux/linux_utilities/Makefile
frontend/linux/workbench/Makefile
+frontend/linux/workbench/mysql-workbench
generated/Makefile
- testing/tut/Params.inc
])
---- frontend/linux/workbench/mysql-workbench
-+++ frontend/linux/workbench/mysql-workbench
-@@ -4,14 +4,18 @@
+diff -Naru mysql-workbench-oss-5.1.10-bak//frontend/linux/workbench/mysql-workbench.in mysql-workbench-oss-5.1.10/frontend/linux/workbench/mysql-workbench.in
+--- mysql-workbench-oss-5.1.10-bak//frontend/linux/workbench/mysql-workbench.in 2009-04-14 21:20:14.000000000 +0200
++++ mysql-workbench-oss-5.1.10/frontend/linux/workbench/mysql-workbench.in 2009-04-14 21:26:58.000000000 +0200
+@@ -5,7 +5,7 @@
bindirname=`dirname $program_path`
basedirname=$(cd "$bindirname/..";pwd)
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+datadir=@datarootdir@
--export LD_LIBRARY_PATH="$basedirname/lib/mysql-workbench:$LD_LIBRARY_PATH"
-+export LD_LIBRARY_PATH="$libdir/mysql-workbench:$LD_LIBRARY_PATH"
+-libdir=$(basename #libdir#)
++libdir=$(basename @libdir@)
--export MWB_DATA_DIR="$basedirname/share/mysql-workbench"
--export MWB_MODULE_DIR="$basedirname/lib/mysql-workbench/modules"
--export MWB_PLUGIN_DIR="$basedirname/lib/mysql-workbench/plugins"
-+export MWB_DATA_DIR="$datadir/mysql-workbench"
-+export MWB_MODULE_DIR="$libdir/mysql-workbench/modules"
-+export MWB_PLUGIN_DIR="$libdir/mysql-workbench/plugins"
+ export LD_LIBRARY_PATH="$basedirname/$libdir/mysql-workbench:$LD_LIBRARY_PATH"
--export DBC_DRIVER_PATH="$basedirname/lib/mysql-workbench"
-+export DBC_DRIVER_PATH="$libdir/mysql-workbench"
-
- if type -p catchsegv > /dev/null; then
- catchsegv $bindirname/mysql-workbench-bin $*
++++++ mysql-workbench-5.1.12-code-cleanup.patch ++++++
Index: frontend/linux/workbench/toolbar_manager.cpp
===================================================================
--- frontend/linux/workbench/toolbar_manager.cpp.orig
+++ frontend/linux/workbench/toolbar_manager.cpp
@@ -309,7 +309,9 @@ bool ToolbarManager::on_searchitem_key_r
{
_search_text = e->get_text();
_be->activate_command("builtin:searchbox");
+ return true;
}
+ return false;
}
Index: plugins/db.mysql.editors/linux/mysql_routinegroup_editor_fe.cpp
===================================================================
--- plugins/db.mysql.editors/linux/mysql_routinegroup_editor_fe.cpp.orig
+++ plugins/db.mysql.editors/linux/mysql_routinegroup_editor_fe.cpp
@@ -137,6 +137,7 @@ bool DbMySQLRoutineGroupEditor::switch_e
refresh_form_data();
delete old_be;
+ return true;
}
//------------------------------------------------------------------------------
++++++ mysql-workbench-5.1.7-disable-bundled.patch -> mysql-workbench-5.1.12-disable-bundled.patch ++++++
--- mysql-workbench/mysql-workbench-5.1.7-disable-bundled.patch 2009-02-12 14:33:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/mysql-workbench/mysql-workbench-5.1.12-disable-bundled.patch 2009-05-15 15:44:58.000000000 +0200
@@ -1,24 +1,21 @@
-diff -Naru mysql-workbench-oss-5.1.7-bak/backend/grt/Makefile.am mysql-workbench-oss-5.1.7/backend/grt/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/backend/grt/Makefile.am 2009-02-12 14:26:52.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/backend/grt/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-@@ -5,8 +5,7 @@
- INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@\
- -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src\
- -I$(top_srcdir)/backend -I$(top_srcdir)/generated\
-- -I$(top_srcdir)/library -I$(top_srcdir)/modules\
-- -I$(top_srcdir)/ext
-+ -I$(top_srcdir)/library -I$(top_srcdir)/modules
-
- libgrtbe_la_SOURCES=\
- editor_base.cpp\
-diff -Naru mysql-workbench-oss-5.1.7-bak/configure.in mysql-workbench-oss-5.1.7/configure.in
---- mysql-workbench-oss-5.1.7-bak/configure.in 2009-02-12 14:26:53.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/configure.in 2009-02-12 14:26:53.000000000 +0100
-@@ -44,12 +44,10 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS=ext library tools/genobj generated backend modules frontend plugins res images
++SUBDIRS=library tools/genobj generated backend modules frontend plugins res images
+ tests:
+ DEST_DIR=$(prefix) TEST_MODULES_DIR=$(prefix)/lib/mysql-workbench/modules make -C testing/tut test
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -45,11 +45,10 @@ AC_CHECK_HEADERS([sys/select.h])
AC_CHECK_HEADERS([tr1/unordered_set tr1/unordered_map])
--
+
-## apparently fedora has hacked the default install dir of ctemplate headers.........
-#AC_CHECK_HEADERS([ctemplate/template.h], AC_DEFINE(CTEMPLATE_NOT_IN_GOOGLE, [], [ctemplate headers not in standard location]) ,
-# [ AC_CHECK_HEADERS([google/template.h], [],AC_MSG_ERROR(["ctemplate not found"])) ] )
@@ -31,28 +28,42 @@
-@@ -354,8 +352,6 @@
+@@ -111,6 +110,8 @@ AC_SUBST(GNOME_LIBS)
+ #
+ # mysql headers
+ #
++AC_CHECK_HEADERS([mysql-connector/cppconn/exception.h],[],AC_MSG_ERROR(["MySQL Connector/C++ not found"]))
++
+ AC_ARG_WITH(mysql-config,
+ [ --with-mysql-config=<path> specifies how to run the mysql_config script [default=mysql_config]],
+ ac_mysql_config_path="$withval", ac_mysql_config_path="mysql_config")
+@@ -354,10 +355,6 @@ res/Makefile
res/grt/Makefile
res/grtdata/Makefile
res/wbdata/Makefile
-ext/Makefile
-ext/scintilla/gtk/Makefile
+-ext/cppconn/Makefile
+-ext/cppconn/driver/Makefile
backend/Makefile
- backend/grt/Makefile
- backend/grtdb/Makefile
-@@ -411,7 +407,5 @@
- generated/Makefile
- ])
+ backend/wbpublic/Makefile
+ backend/wbprivate/Makefile
+@@ -412,9 +409,3 @@ generated/Makefile
--AC_CONFIG_SUBDIRS(ext/ctemplate/ctemplate-src)
--
AC_OUTPUT()
-diff -Naru mysql-workbench-oss-5.1.7-bak/frontend/linux/linux_utilities/Makefile.am mysql-workbench-oss-5.1.7/frontend/linux/linux_utilities/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/frontend/linux/linux_utilities/Makefile.am 2009-02-12 14:26:52.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/frontend/linux/linux_utilities/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-@@ -4,7 +4,7 @@
- noinst_LTLIBRARIES=liblinux_utilities.la
+-(
+- cd ./ext/ctemplate/ctemplate-src &&
+- autoreconf -i -s;
+- ./configure --prefix=$prefix --libdir=$libdir/mysql-workbench --disable-dependency-tracking
+-)
+-
+Index: frontend/linux/linux_utilities/Makefile.am
+===================================================================
+--- frontend/linux/linux_utilities/Makefile.am.orig
++++ frontend/linux/linux_utilities/Makefile.am
+@@ -4,14 +4,13 @@ CXXFLAGS+=-rdynamic
+ pkglib_LTLIBRARIES=liblinux_utilities.la
liblinux_utilities_la_LIBADD=$(top_srcdir)/frontend/linux/sqlide/libsqlide.la\
- $(top_srcdir)/ext/scintilla/gtk/libwbscintilla.la
@@ -60,18 +71,18 @@
INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \
-@@ -13,7 +13,6 @@
- -I$(top_srcdir)/backend/grt\
- -I$(top_srcdir)/frontend/linux/gtk_utilities\
+ -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\
+ -I$(top_srcdir)/frontend/linux/workbench\
-I$(top_srcdir)/frontend/linux/sqlide\
- -I$(top_srcdir)/ext/scintilla/include\
-I$(top_srcdir)/library/forms\
-I$(top_srcdir)/library/forms/gtk\
-I$(top_srcdir)/generated/grti\
-diff -Naru mysql-workbench-oss-5.1.7-bak/frontend/linux/sqlide/Makefile.am mysql-workbench-oss-5.1.7/frontend/linux/sqlide/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/frontend/linux/sqlide/Makefile.am 2009-02-12 14:26:52.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/frontend/linux/sqlide/Makefile.am 2009-02-12 14:30:26.000000000 +0100
-@@ -3,7 +3,7 @@
+Index: frontend/linux/sqlide/Makefile.am
+===================================================================
+--- frontend/linux/sqlide/Makefile.am.orig
++++ frontend/linux/sqlide/Makefile.am
+@@ -3,7 +3,7 @@ CXXFLAGS+=-rdynamic
pkglib_LTLIBRARIES=libsqlide.la
@@ -80,7 +91,7 @@
INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GRT_CFLAGS@ @CAIRO_CFLAGS@ @GNOME_CFLAGS@\
-I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \
-@@ -13,8 +13,7 @@
+@@ -12,8 +12,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
-I$(top_srcdir)/library/forms\
-I$(top_srcdir)/library/forms/gtk\
-I$(top_srcdir)/generated/grti\
@@ -90,19 +101,113 @@
libsqlide_la_SOURCES=\
sql_editor_fe.cpp\
-diff -Naru mysql-workbench-oss-5.1.7-bak/Makefile.am mysql-workbench-oss-5.1.7/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-@@ -1,4 +1,4 @@
--SUBDIRS=ext library tools/genobj generated backend modules frontend plugins res images
-+SUBDIRS=library tools/genobj generated backend modules frontend plugins res images
+Index: frontend/linux/workbench/Makefile.am
+===================================================================
+--- frontend/linux/workbench/Makefile.am.orig
++++ frontend/linux/workbench/Makefile.am
+@@ -42,7 +42,7 @@ mysql_workbench_bin_LDADD=\
+ $(top_srcdir)/library/sql-parser/source/libsqlparser.la\
+ $(top_srcdir)/library/canvas/src/libmdcanvas.la\
+ $(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
+- $(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la\
++ -lctemplate \
+ @GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@
+
+ #precompiled.h.gch: precompiled.h
+Index: library/dbc/src/cppdbc.h
+===================================================================
+--- library/dbc/src/cppdbc.h.orig
++++ library/dbc/src/cppdbc.h
+@@ -5,15 +5,15 @@
+ #include "driver_manager.h"
+ #include "sql_batch_exec.h"
+
+-#include <cppconn/connection.h>
+-#include <cppconn/driver.h>
+-#include <cppconn/exception.h>
+-#include <cppconn/metadata.h>
+-#include <cppconn/parameter_metadata.h>
+-#include <cppconn/prepared_statement.h>
+-#include <cppconn/resultset.h>
+-#include <cppconn/resultset_metadata.h>
+-#include <cppconn/statement.h>
++#include <mysql-connector/cppconn/connection.h>
++#include <mysql-connector/cppconn/driver.h>
++#include <mysql-connector/cppconn/exception.h>
++#include <mysql-connector/cppconn/metadata.h>
++#include <mysql-connector/cppconn/parameter_metadata.h>
++#include <mysql-connector/cppconn/prepared_statement.h>
++#include <mysql-connector/cppconn/resultset.h>
++#include <mysql-connector/cppconn/resultset_metadata.h>
++#include <mysql-connector/cppconn/statement.h>
+
+
+ #endif // _CPPDBC_H_
+Index: library/dbc/src/driver_manager.cpp
+===================================================================
+--- library/dbc/src/driver_manager.cpp.orig
++++ library/dbc/src/driver_manager.cpp
+@@ -7,9 +7,9 @@
+
+ #include "driver_manager.h"
+ #include <gmodule.h>
+-#include <cppconn/connection.h>
+-#include <cppconn/statement.h>
+-#include <cppconn/exception.h>
++#include <mysql-connector/cppconn/connection.h>
++#include <mysql-connector/cppconn/statement.h>
++#include <mysql-connector/cppconn/exception.h>
+
+
+ namespace sql {
+Index: library/dbc/src/driver_manager.h
+===================================================================
+--- library/dbc/src/driver_manager.h.orig
++++ library/dbc/src/driver_manager.h
+@@ -4,7 +4,7 @@
- tests:
- DEST_DIR=$(prefix) TEST_MODULES_DIR=$(prefix)/lib/mysql-workbench/modules make -C testing/tut test
-diff -Naru mysql-workbench-oss-5.1.7-bak/modules/db.mysql/Makefile.am mysql-workbench-oss-5.1.7/modules/db.mysql/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/modules/db.mysql/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/modules/db.mysql/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-@@ -21,7 +21,6 @@
+ #include "cppdbc_public_interface.h"
+ #include "grts/structs.db.mgmt.h"
+-#include <cppconn/driver.h>
++#include <mysql-connector/cppconn/driver.h>
+ #include <memory>
+
+
+Index: library/dbc/src/sql_batch_exec.cpp
+===================================================================
+--- library/dbc/src/sql_batch_exec.cpp.orig
++++ library/dbc/src/sql_batch_exec.cpp
+@@ -1,8 +1,8 @@
+ #include "stdafx.h"
+
+ #include "sql_batch_exec.h"
+-#include <cppconn/exception.h>
+-#include <cppconn/resultset.h>
++#include <mysql-connector/cppconn/exception.h>
++#include <mysql-connector/cppconn/resultset.h>
+ #include <memory>
+
+ namespace sql
+Index: library/dbc/src/sql_batch_exec.h
+===================================================================
+--- library/dbc/src/sql_batch_exec.h.orig
++++ library/dbc/src/sql_batch_exec.h
+@@ -3,8 +3,8 @@
+
+
+ #include "cppdbc_public_interface.h"
+-#include <cppconn/statement.h>
+-#include <cppconn/connection.h>
++#include <mysql-connector/cppconn/statement.h>
++#include <mysql-connector/cppconn/connection.h>
+ #include <sigc++/sigc++.h>
+ #include <list>
+ #include <string>
+Index: modules/db.mysql/Makefile.am
+===================================================================
+--- modules/db.mysql/Makefile.am.orig
++++ modules/db.mysql/Makefile.am
+@@ -21,7 +21,6 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
-I$(top_srcdir)/library/grt/src/diff\
-I$(top_srcdir)/library/sql-parser/include\
-I$(top_srcdir)/library/sql-parser/source\
@@ -110,12 +215,22 @@
@GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
-diff -Naru mysql-workbench-oss-5.1.7-bak/modules/wb.model/Makefile.am mysql-workbench-oss-5.1.7/modules/wb.model/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/modules/wb.model/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/modules/wb.model/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-@@ -62,12 +62,10 @@
+@@ -32,7 +31,7 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
+ #
+
+ db_mysql_grt_la_LDFLAGS=-module
+-db_mysql_grt_la_LIBADD=$(top_srcdir)/ext/ctemplate/ctemplate-src/.libs/libctemplate_wb.la
++db_mysql_grt_la_LIBADD=-lctemplate
+
+
+ db_mysql_grt_la_SOURCES=src/db_mysql_catalog_report.cpp\
+Index: modules/wb.model/Makefile.am
+===================================================================
+--- modules/wb.model/Makefile.am.orig
++++ modules/wb.model/Makefile.am
+@@ -61,12 +61,10 @@ INCLUDES=-I$(top_srcdir)/generated\
+ -I$(top_srcdir)/library/sql-parser/source\
-I$(top_srcdir)/library/sql-parser/source/linux\
- -I$(top_srcdir)/backend/grtdb\
-I$(top_srcdir)/library/tinyxml\
- -I$(top_srcdir)/ext/ctemplate/ctemplate-src/src\
@MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
@@ -126,32 +241,43 @@
wb_model_grt_la_SOURCES=src/graph_renderer.cpp \
src/reporting.cpp \
-diff -Naru mysql-workbench-oss-5.1.7-bak/modules/wb.mysql.validation/Makefile.am mysql-workbench-oss-5.1.7/modules/wb.mysql.validation/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/modules/wb.mysql.validation/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/modules/wb.mysql.validation/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-@@ -7,7 +7,6 @@
- -I$(top_srcdir)/backend\
+Index: modules/wb.mysql.validation/Makefile.am
+===================================================================
+--- modules/wb.mysql.validation/Makefile.am.orig
++++ modules/wb.mysql.validation/Makefile.am
+@@ -7,7 +7,6 @@ INCLUDES=-I$(top_srcdir)/generated\
+ -I$(top_srcdir)/backend/wbpublic\
-I$(top_srcdir)/library/grt/src \
-I$(top_srcdir)/library \
- -I$(top_srcdir)/ext \
-I$(top_srcdir)/library/utilities/src\
-I$(top_srcdir)/modules\
-I$(top_srcdir)/modules/wb.validation/src\
-diff -Naru mysql-workbench-oss-5.1.7-bak/modules/wb.validation/Makefile.am mysql-workbench-oss-5.1.7/modules/wb.validation/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/modules/wb.validation/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/modules/wb.validation/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-@@ -8,7 +8,6 @@
- -I$(top_srcdir)/library/grt/src \
- -I$(top_srcdir)/library \
- -I$(top_srcdir)/library/utilities/src\
-- -I$(top_srcdir)/ext\
- -I$(top_srcdir)/modules\
- -I$(top_srcdir)/library/grt/src/diff\
- -I$(top_srcdir)/library/sql-parser/include\
-diff -Naru mysql-workbench-oss-5.1.7-bak/plugins/db.mysql.editors/linux/Makefile.am mysql-workbench-oss-5.1.7/plugins/db.mysql.editors/linux/Makefile.am
---- mysql-workbench-oss-5.1.7-bak/plugins/db.mysql.editors/linux/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-+++ mysql-workbench-oss-5.1.7/plugins/db.mysql.editors/linux/Makefile.am 2009-02-12 14:26:53.000000000 +0100
-@@ -28,13 +28,12 @@
+@@ -20,7 +19,6 @@ INCLUDES=-I$(top_srcdir)/generated\
+
+
+ wb_mysql_validation_grt_la_LDFLAGS=-module
+-#wb_mysql_import_grt_la_LIBADD=$(top_srcdir)
+
+ wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\
+ src/wb_module_validation_mysql.cpp\
+Index: plugins/db.mysql.diff.reporting/frontend/Makefile.am
+===================================================================
+--- plugins/db.mysql.diff.reporting/frontend/Makefile.am.orig
++++ plugins/db.mysql.diff.reporting/frontend/Makefile.am
+@@ -9,7 +9,6 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
+ -I$(top_srcdir)/backend\
+ -I$(top_srcdir)/modules/db.mysql/src\
+ -I$(top_srcdir)/library/dbc/src\
+- -I$(top_srcdir)/ext/cppconn\
+ -I$(top_srcdir)/modules/interfaces\
+ -I$(top_srcdir)/modules/\
+ -I$(top_srcdir)/library/grt/src/diff\
+Index: plugins/db.mysql.editors/linux/Makefile.am
+===================================================================
+--- plugins/db.mysql.editors/linux/Makefile.am.orig
++++ plugins/db.mysql.editors/linux/Makefile.am
+@@ -26,13 +26,12 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
-I$(top_srcdir)/frontend/linux/workbench\
-I$(top_srcdir)/frontend/linux/linux_utilities\
-I$(top_srcdir)/frontend/linux/sqlide\
@@ -166,3 +292,83 @@
db_mysql_editors_wbp_la_SOURCES=\
../backend/mysql_relationship_editor.cpp\
+Index: backend/wbprivate/Makefile.am
+===================================================================
+--- backend/wbprivate/Makefile.am.orig
++++ backend/wbprivate/Makefile.am
+@@ -6,7 +6,7 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
+ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src -I$(top_srcdir)/library/forms\
+ -I$(top_srcdir)/modules -I$(top_srcdir)/frontend/common\
+ -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated -I$(top_srcdir)/library/canvas/src\
+- -I$(top_srcdir)/ext/cppconn/ -I$(top_srcdir)/library/dbc/src
++ -I$(top_srcdir)/library/dbc/src
+
+ libwbprivate_a_SOURCES=\
+ workbench/metaclasses.cpp\
+Index: backend/wbpublic/Makefile.am
+===================================================================
+--- backend/wbpublic/Makefile.am.orig
++++ backend/wbpublic/Makefile.am
+@@ -9,11 +9,9 @@ INCLUDES=@GLIB_CFLAGS@ @SIGC_CFLAGS@ @GR
+ -I$(top_srcdir)/library/grt/src -I$(top_srcdir)/library/utilities/src \
+ -I$(top_srcdir)/library/forms\
+ -I$(top_srcdir)/library/canvas/src\
+- -I$(top_srcdir)/ext/cppconn\
+ -I$(top_srcdir)/library/dbc/src\
+ -I$(top_srcdir)/backend/wbpublic -I$(top_srcdir)/generated\
+- -I$(top_srcdir)/modules\
+- -I$(top_srcdir)/ext
++ -I$(top_srcdir)/modules
+
+ libwbpublic_la_SOURCES=\
+ grt/refresh_ui.cpp\
+Index: library/dbc/Makefile.am
+===================================================================
+--- library/dbc/Makefile.am.orig
++++ library/dbc/Makefile.am
+@@ -11,8 +11,7 @@ src/sql_batch_exec.cpp
+ INCLUDES=@CAIRO_CFLAGS@ @GNOME_CFLAGS@ @SIGC_CFLAGS@ -I$(top_srcdir)/backend\
+ -I$(top_srcdir)/generated\
+ -I$(top_srcdir)/library/grt/src\
+--I$(top_srcdir)/library/utilities/src\
+--I$(top_srcdir)/ext/cppconn
++-I$(top_srcdir)/library/utilities/src
+
+
+
+Index: modules/db.mysql.sqlparser/Makefile.am
+===================================================================
+--- modules/db.mysql.sqlparser/Makefile.am.orig
++++ modules/db.mysql.sqlparser/Makefile.am
+@@ -13,7 +13,6 @@ INCLUDES=\
+ -I$(top_srcdir)/library/sql-parser/include\
+ -I$(top_srcdir)/library/sql-parser/source\
+ -I$(top_srcdir)/library/sql-parser/source/linux\
+- -I$(top_srcdir)/ext\
+ -I$(top_srcdir)/library/tinyxml\
+ @MYSQL_INCLUDE@ @GRT_CFLAGS@ @GLIB_CFLAGS@ @SIGC_CFLAGS@
+
+Index: modules/wb.validation/Makefile.am
+===================================================================
+--- modules/wb.validation/Makefile.am.orig
++++ modules/wb.validation/Makefile.am
+@@ -8,7 +8,6 @@ INCLUDES=-I$(top_srcdir)/generated\
+ -I$(top_srcdir)/library/grt/src \
+ -I$(top_srcdir)/library \
+ -I$(top_srcdir)/library/utilities/src\
+- -I$(top_srcdir)/ext\
+ -I$(top_srcdir)/modules\
+ -I$(top_srcdir)/library/grt/src/diff\
+ -I$(top_srcdir)/library/sql-parser/include\
+Index: plugins/db.mysql/frontend/Makefile.am
+===================================================================
+--- plugins/db.mysql/frontend/Makefile.am.orig
++++ plugins/db.mysql/frontend/Makefile.am
+@@ -9,7 +9,6 @@ INCLUDES=-I$(top_srcdir)/generated -I$(t
+ -I$(top_srcdir)/backend\
+ -I$(top_srcdir)/modules/db.mysql/src\
+ -I$(top_srcdir)/library/dbc/src\
+- -I$(top_srcdir)/ext/cppconn\
+ -I$(top_srcdir)/modules/interfaces\
+ -I$(top_srcdir)/modules/\
+ -I$(top_srcdir)/library/grt/src/diff\
++++++ mysql-workbench-5.1.12-gcc-44.patch ++++++
Index: library/canvas/src/mdc_common.h
===================================================================
--- library/canvas/src/mdc_common.h.orig
+++ library/canvas/src/mdc_common.h
@@ -6,6 +6,7 @@
#include <list>
#include <vector>
#include <string>
+#include <stdio.h>
#include <map>
#include <set>
#include <stdexcept>
Index: library/forms/filechooser.cpp
===================================================================
--- library/forms/filechooser.cpp.orig
+++ library/forms/filechooser.cpp
@@ -2,6 +2,7 @@
#include "stdafx.h"
#include <mforms/mforms.h>
+#include <stdio.h>
using namespace mforms;
Index: library/forms/mforms.cpp
===================================================================
--- library/forms/mforms.cpp.orig
+++ library/forms/mforms.cpp
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include <string.h>
+#include <stdio.h>
#include "mforms/mforms.h"
#include "mforms/simpleform.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package mysql-gui-tools for openSUSE:Factory
checked in at Fri May 22 00:02:10 CEST 2009.
--------
--- mysql-gui-tools/mysql-gui-tools.changes 2009-02-20 16:38:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/mysql-gui-tools/mysql-gui-tools.changes 2009-04-14 19:58:34.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 14 19:57:52 CEST 2009 - mhrusecky(a)suse.cz
+
+- fixed build for gcc 4.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
mysql-gui-tools-gcc4.4.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-gui-tools.spec ++++++
--- /var/tmp/diff_new_pack.ez7372/_old 2009-05-22 00:01:57.000000000 +0200
+++ /var/tmp/diff_new_pack.ez7372/_new 2009-05-22 00:01:57.000000000 +0200
@@ -19,11 +19,12 @@
Name: mysql-gui-tools
-BuildRequires: e2fsprogs-devel gcc-c++ gtkhtml2-devel gtkmm24-devel libexpat-devel libglade2-devel libgnomeprint-devel lua50-devel mysql-devel pcre-devel perl-XML-Parser update-desktop-files vim-base
-BuildRequires: Mesa-devel
+BuildRequires: e2fsprogs-devel gcc-c++ gtkhtml2-devel gtkmm24-devel libexpat-devel libglade2-devel
+BuildRequires: libgnomeprint-devel mysql-devel pcre-devel perl-XML-Parser update-desktop-files vim-base
+BuildRequires: Mesa-devel lua50-devel
Summary: Common Files for MySQL GUI Tools
Version: 5.0r14
-Release: 1
+Release: 2
Group: Productivity/Databases/Clients
License: GPL v2 or later
Url: http://www.mysql.com/products/tools/query-browser/
@@ -42,6 +43,7 @@
Patch40: mysql-gui-tools-gcc-errors.patch
Patch41: mysql-gui-tools-path-changes.patch
Patch42: mysql-gui-tools-new-gtk.patch
+Patch43: mysql-gui-tools-gcc4.4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: mysql-administrator mysql-query-browser mysql-workbench
@@ -115,6 +117,8 @@
%patch41 -p1
# fixing old GTK macros
%patch42 -p1
+# fixing build for gcc 4.4
+%patch43 -p1
# 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"
@@ -186,6 +190,8 @@
%{_datadir}/mysql-gui/query-browser/
%changelog
+* Tue Apr 14 2009 mhrusecky(a)suse.cz
+- fixed build for gcc 4.4
* Fri Feb 20 2009 mhrusecky(a)suse.cz
- fixed dependencies
* Thu Jan 08 2009 mhrusecky(a)suse.cz
@@ -252,11 +258,11 @@
* fixed configure.in
* Wed Jan 31 2007 anosek(a)suse.cz
- updated to version 5.0r9
-* Mon Oct 30 2006 mjancar(a)suse.cz
+* Tue Oct 31 2006 mjancar(a)suse.cz
- build aganist lua50
-* Mon Oct 23 2006 ro(a)suse.de
+* Tue Oct 24 2006 ro(a)suse.de
- try to fix build with current lua (use pkgconfig to find lib)
-* Thu Oct 12 2006 ro(a)suse.de
+* Fri Oct 13 2006 ro(a)suse.de
- fix missing return value (mysql-gui-tools-warnings.patch)
* Wed Oct 04 2006 anosek(a)suse.cz
- updated to version 5.0r4
++++++ mysql-gui-tools-gcc4.4.patch ++++++
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
@@ -22,6 +22,7 @@
#include "myx_gc_variant.h"
#include "myx_gc_datatypes.h"
+#include <stdio.h>
//----------------------------------------------------------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kdebindings4 for openSUSE:Factory
checked in at Thu May 21 23:59:48 CEST 2009.
--------
--- KDE/kdebindings4/kdebindings4.changes 2009-05-17 17:22:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes 2009-05-21 23:59:11.629199000 +0200
@@ -1,0 +2,5 @@
+Thu May 21 23:58:51 CEST 2009 - beineri(a)opensuse.org
+
+- fix build with gcc-4.4
+
+-------------------------------------------------------------------
mono-kde4.changes: same change
python-kde4.changes: same change
ruby-kde4.changes: same change
calling whatdependson for head-i586
New:
----
kdebindings-GCC44.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings4.spec ++++++
--- /var/tmp/diff_new_pack.R26683/_old 2009-05-21 23:59:34.000000000 +0200
+++ /var/tmp/diff_new_pack.R26683/_new 2009-05-21 23:59:34.000000000 +0200
@@ -31,11 +31,12 @@
Group: Development/Libraries/KDE
Summary: Bindings for KDE 4.x libraries
Version: 4.2.86svn968571
-Release: 1
+Release: 2
Source0: kdebindings-%version.tar.bz2
Patch0: 4_3_BRANCH.diff
Patch1: plasma_no_examples.diff
Patch2: revert.diff
+Patch3: kdebindings-GCC44.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define is_mono 0
%define is_python 0
@@ -128,6 +129,7 @@
%patch0
%patch1
%patch2 -R
+%patch3
%build
rm -rf xparts php
@@ -388,6 +390,8 @@
%endif
%changelog
+* Thu May 21 2009 beineri(a)opensuse.org
+- fix build with gcc-4.4
* Sun May 17 2009 beineri(a)opensuse.org
- update to 4.2.85 (KDE 4.3 Beta1)
* Thu Apr 30 2009 dmueller(a)suse.de
++++++ mono-kde4.spec ++++++
--- /var/tmp/diff_new_pack.R26683/_old 2009-05-21 23:59:34.000000000 +0200
+++ /var/tmp/diff_new_pack.R26683/_new 2009-05-21 23:59:34.000000000 +0200
@@ -31,11 +31,12 @@
Group: Development/Libraries/KDE
Summary: Mono bindings for KDE 4.x libraries
Version: 4.2.86svn968571
-Release: 1
+Release: 2
Source0: kdebindings-%version.tar.bz2
Patch0: 4_3_BRANCH.diff
Patch1: plasma_no_examples.diff
Patch2: revert.diff
+Patch3: kdebindings-GCC44.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define is_mono 1
%define is_python 0
@@ -127,6 +128,7 @@
%patch0
%patch1
%patch2 -R
+%patch3
%build
rm -rf xparts php
@@ -387,6 +389,8 @@
%endif
%changelog
+* Thu May 21 2009 beineri(a)opensuse.org
+- fix build with gcc-4.4
* Sun May 17 2009 beineri(a)opensuse.org
- update to 4.2.85 (KDE 4.3 Beta1)
* Thu Apr 30 2009 dmueller(a)suse.de
++++++ python-kde4.spec ++++++
--- /var/tmp/diff_new_pack.R26683/_old 2009-05-21 23:59:34.000000000 +0200
+++ /var/tmp/diff_new_pack.R26683/_new 2009-05-21 23:59:34.000000000 +0200
@@ -31,11 +31,12 @@
Group: Development/Libraries/KDE
Summary: Python Bindings for KDE 4.x Platform
Version: 4.2.86svn968571
-Release: 1
+Release: 2
Source0: kdebindings-%version.tar.bz2
Patch0: 4_3_BRANCH.diff
Patch1: plasma_no_examples.diff
Patch2: revert.diff
+Patch3: kdebindings-GCC44.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define is_mono 0
%define is_python 1
@@ -128,6 +129,7 @@
%patch0
%patch1
%patch2 -R
+%patch3
%build
rm -rf xparts php
@@ -388,6 +390,8 @@
%endif
%changelog
+* Thu May 21 2009 beineri(a)opensuse.org
+- fix build with gcc-4.4
* Sun May 17 2009 beineri(a)opensuse.org
- update to 4.2.85 (KDE 4.3 Beta1)
* Thu Apr 30 2009 dmueller(a)suse.de
++++++ ruby-kde4.spec ++++++
--- /var/tmp/diff_new_pack.R26683/_old 2009-05-21 23:59:34.000000000 +0200
+++ /var/tmp/diff_new_pack.R26683/_new 2009-05-21 23:59:34.000000000 +0200
@@ -31,11 +31,12 @@
Group: Development/Libraries/KDE
Summary: Ruby bindings for KDE 4
Version: 4.2.86svn968571
-Release: 1
+Release: 2
Source0: kdebindings-%version.tar.bz2
Patch0: 4_3_BRANCH.diff
Patch1: plasma_no_examples.diff
Patch2: revert.diff
+Patch3: kdebindings-GCC44.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define is_mono 0
%define is_python 0
@@ -128,6 +129,7 @@
%patch0
%patch1
%patch2 -R
+%patch3
%build
rm -rf xparts php
@@ -388,6 +390,8 @@
%endif
%changelog
+* Thu May 21 2009 beineri(a)opensuse.org
+- fix build with gcc-4.4
* Sun May 17 2009 beineri(a)opensuse.org
- update to 4.2.85 (KDE 4.3 Beta1)
* Thu Apr 30 2009 dmueller(a)suse.de
++++++ kdebindings4.spec.in ++++++
--- /var/tmp/diff_new_pack.R26683/_old 2009-05-21 23:59:34.000000000 +0200
+++ /var/tmp/diff_new_pack.R26683/_new 2009-05-21 23:59:34.000000000 +0200
@@ -27,6 +27,7 @@
Patch0: 4_3_BRANCH.diff
Patch1: plasma_no_examples.diff
Patch2: revert.diff
+Patch3: kdebindings-GCC44.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define is_mono 0
%define is_python 0
@@ -101,6 +102,7 @@
%patch0
%patch1
%patch2 -R
+%patch3
%build
rm -rf xparts php
++++++ kdebindings-GCC44.diff ++++++
--- csharp/kimono/src/marshall_macros_kde.h
+++ csharp/kimono/src/marshall_macros_kde.h
@@ -1,3 +1,4 @@
+#include <stdio.h>
#include <ksharedptr.h>
template<class Item, const char *ItemSTR>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kdepim4 for openSUSE:Factory
checked in at Thu May 21 23:59:44 CEST 2009.
--------
--- KDE/kdepim4/kdepim4.changes 2009-05-15 21:13:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim4/kdepim4.changes 2009-05-21 16:54:09.000000000 +0200
@@ -1,0 +2,5 @@
+Thu May 21 16:53:58 CEST 2009 - coolo(a)novell.com
+
+- fix file conflict with oxygen-icon-theme
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4.spec ++++++
--- /var/tmp/diff_new_pack.Y24857/_old 2009-05-21 23:59:26.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24857/_new 2009-05-21 23:59:26.000000000 +0200
@@ -37,7 +37,7 @@
Summary: Base package of kdepim
Url: http://www.kde.org
Version: 4.2.85
-Release: 1
+Release: 2
Source0: kdepim-%version.tar.bz2
Patch: 4_3_BRANCH.diff
Patch1: akregator-useragent.diff
@@ -126,6 +126,8 @@
cp /usr/share/icons/oxygen/32x32/apps/office-address-book.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/
cp /usr/share/icons/oxygen/48x48/apps/office-address-book.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/
cp /usr/share/icons/oxygen/64x64/apps/office-address-book.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/
+ # resolve file conflict
+ rm $RPM_BUILD_ROOT/usr/share/icons/oxygen/16x16/status/meeting-organizer.png
%create_subdir_filelist -d ktimetracker
%create_subdir_filelist -d korganizer -v devel
%create_subdir_filelist -d kalarm -v devel
@@ -850,6 +852,8 @@
%exclude /usr/share/kde4/apps/knode/pics/*
%changelog
+* Thu May 21 2009 coolo(a)novell.com
+- fix file conflict with oxygen-icon-theme
* Thu May 14 2009 dmueller(a)suse.de
- update to 4.2.85 (KDE 4.3 Beta1)
* Fri May 08 2009 beineri(a)opensuse.org
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package jflex for openSUSE:Factory
checked in at Thu May 21 23:57:55 CEST 2009.
--------
--- jflex/jflex-bootstrap.changes 2009-05-05 09:37:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/jflex/jflex-bootstrap.changes 2009-05-21 17:16:27.000000000 +0200
@@ -1,0 +2,5 @@
+Thu May 21 17:11:33 CEST 2009 - mvyskocil(a)suse.cz
+
+- Removed a jflex-lex-scan.patch
+
+-------------------------------------------------------------------
jflex.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jflex-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.a13244/_old 2009-05-21 23:57:05.000000000 +0200
+++ /var/tmp/diff_new_pack.a13244/_new 2009-05-21 23:57:05.000000000 +0200
@@ -29,7 +29,7 @@
# This line is not a comment, please do not remove it!
#%(sh %{_sourcedir}/jpackage-bootstrap-prepare.sh %{_sourcedir} %{name})
Version: 1.4.3
-Release: 2
+Release: 3
Summary: Lexical Analyzer Generator for Java
License: GPL v2 only
Group: Development/Libraries/Java
@@ -152,7 +152,7 @@
%else
# You must use Re jflex.spec and have a java-cup and jflex installed
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
%patch4 -p1
%endif
@@ -211,6 +211,8 @@
%endif
%changelog
+* Thu May 21 2009 mvyskocil(a)suse.cz
+- Removed a jflex-lex-scan.patch
* Tue May 05 2009 mvyskocil(a)suse.cz
- Update to 1.4.3 (bugfix release)
- Build using java-1_5_0-gcj to allow openjdk bootstrap
jflex.spec: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ctemplate for openSUSE:Factory
checked in at Thu May 21 23:56:16 CEST 2009.
--------
--- ctemplate/ctemplate.changes 2009-02-20 13:51:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/ctemplate/ctemplate.changes 2009-05-21 16:05:09.000000000 +0200
@@ -1,0 +2,19 @@
+Thu May 7 17:38:23 CEST 2009 - mhrusecky(a)suse.cz
+
+- version update (version 0.94)
+ * Use arena for all memory allocations: 3-4% speedup (csilvers)
+ * Add the ability to hook the annotation system (ryoji)
+ * Expose Expand(ExpandEmitter*,...) to allow custom emitters (csilvers)
+ * Add RemoveStringFromTemplateCache (csilvers)
+ * Add new :url_escape_with_arg=css modifier for urls in CSS (jad)
+ * Support tr1's unordered_map in preference to hash_map (csilvers)
+ * Use Murmurhash for all string hashing, rather than hash<> (csilvers)
+ * Better parsing of meta tags and dangling < for auto-escape (falmeida)
+ * Add AddXssSafeModifier (jad)
+ * Allow disabling auto-escape for 'trusted' vars (jad)
+ * BUGFIX: resolve possible memory-leaks in CopyDictionary (csilvers)
+ * BUGFIX: fix bug when reloading with AUTOESCAPE pragma (jad)
+ * Updated autoconf version to 2.61 and libtool version to 1.5.26
+- ctemplate-0.93-bswap.patch was merged upstream
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ctemplate-0.93-bswap.patch
ctemplate-0.93.tar.bz2
New:
----
ctemplate-0.94.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ctemplate.spec ++++++
--- /var/tmp/diff_new_pack.y16903/_old 2009-05-21 23:55:49.000000000 +0200
+++ /var/tmp/diff_new_pack.y16903/_new 2009-05-21 23:55:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ctemplate (Version 0.93)
+# spec file for package ctemplate (Version 0.94)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,14 +20,13 @@
Name: ctemplate
Summary: Library for simple but powerful template language for C++
-Version: 0.93
-Release: 2
+Version: 0.94
+Release: 1
Group: Development/Libraries/C and C++
License: BSD 3-Clause
Url: http://code.google.com/p/google-ctemplate/
Source: %{name}-%{version}.tar.bz2
Patch0: %{name}-0.92-gcc44.patch
-Patch1: %{name}-0.93-bswap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
@@ -78,7 +77,7 @@
%prep
%setup
%patch0 -p1
-%patch1 -p1
+chmod -R u+w .
%build
%configure --disable-static
@@ -113,6 +112,22 @@
%{_defaultdocdir}/%{name}/[a-z]*
%changelog
+* Thu May 07 2009 mhrusecky(a)suse.cz
+- version update (version 0.94)
+ * Use arena for all memory allocations: 3-4%% speedup (csilvers)
+ * Add the ability to hook the annotation system (ryoji)
+ * Expose Expand(ExpandEmitter*,...) to allow custom emitters (csilvers)
+ * Add RemoveStringFromTemplateCache (csilvers)
+ * Add new :url_escape_with_arg=css modifier for urls in CSS (jad)
+ * Support tr1's unordered_map in preference to hash_map (csilvers)
+ * Use Murmurhash for all string hashing, rather than hash<> (csilvers)
+ * Better parsing of meta tags and dangling < for auto-escape (falmeida)
+ * Add AddXssSafeModifier (jad)
+ * Allow disabling auto-escape for 'trusted' vars (jad)
+ * BUGFIX: resolve possible memory-leaks in CopyDictionary (csilvers)
+ * BUGFIX: fix bug when reloading with AUTOESCAPE pragma (jad)
+ * Updated autoconf version to 2.61 and libtool version to 1.5.26
+- ctemplate-0.93-bswap.patch was merged upstream
* Fri Feb 20 2009 mhrusecky(a)suse.cz
- corrected bswap function name - fixed build on ppc & s390
* Mon Feb 16 2009 mhrusecky(a)suse.cz
++++++ ctemplate-0.93.tar.bz2 -> ctemplate-0.94.tar.bz2 ++++++
++++ 32823 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package castor for openSUSE:Factory
checked in at Thu May 21 23:55:35 CEST 2009.
--------
--- castor/castor.changes 2008-04-30 12:58:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/castor/castor.changes 2009-05-21 16:23:40.000000000 +0200
@@ -1,0 +2,7 @@
+Thu May 21 16:22:50 CEST 2009 - mvyskocil(a)suse.cz
+
+- fixed build under gcj44
+- removed unecessary javadocs scripts
+- used fdupes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
castor-0.9.5-src.tgz
New:
----
castor-0.9.5-src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ castor.spec ++++++
--- /var/tmp/diff_new_pack.S30829/_old 2009-05-21 23:55:03.000000000 +0200
+++ /var/tmp/diff_new_pack.S30829/_new 2009-05-21 23:55:03.000000000 +0200
@@ -1,10 +1,17 @@
#
# spec file for package castor (Version 0.9.5)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -13,17 +20,18 @@
Name: castor
BuildRequires: adaptx ant java-1_5_0-gcj-compat-devel jta junit ldapjdk regexp servletapi3 xml-commons-apis
+BuildRequires: fdupes
%define name castor
%define version 0.9.5
%define release 1jpp
%define section free
Summary: An Open Source Data Binding Framework for Java
Version: 0.9.5
-Release: 204
+Release: 297
Group: Development/Libraries/Java
License: BSD 3-Clause
Url: http://www.castor.org/
-Source0: ftp://ftp.exolab.org/pub/castor/castor_0.9.5/castor-0.9.5-src.tgz
+Source0: ftp://ftp.exolab.org/pub/castor/castor_0.9.5/castor-0.9.5-src.tar.bz2
Patch0: castor-unicode-document-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -142,13 +150,13 @@
fi
export GC_MAXIMUM_HEAP_SIZE="134217728"
export CLASSPATH=%(build-classpath adaptx jta junit ldapjdk oro regexp servletapi3 xerces)
+export LC_ALL="en_US.UTF-8" # necessary for javadoc
ant -buildfile src/build.xml jar
ant -buildfile src/build.xml examples
ant -buildfile src/build.xml CTFjar
ant -buildfile src/build.xml javadoc
%install
-rm -rf $RPM_BUILD_ROOT
#export ANT_OPTS="--param max-fields-for-field-sensitive=1 -O1"
export GC_MAXIMUM_HEAP_SIZE="134217728"
# jar
@@ -168,19 +176,11 @@
ant -buildfile src/build.xml doc
# like magic
%jpackage_script org.exolab.castor.builder.SourceGenerator %{nil} %{nil} xerces-j2:%{name} %{name}
+%fdupes -s %{buildroot}
%clean
rm -rf $RPM_BUILD_ROOT
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
-
%files
%defattr(0644,root,root,0755)
%doc src/etc/{CHANGELOG,LICENSE,README}
@@ -212,6 +212,10 @@
%doc build/doc/*
%changelog
+* Thu May 21 2009 mvyskocil(a)suse.cz
+- fixed build under gcj44
+- removed unecessary javadocs scripts
+- used fdupes
* Wed Apr 30 2008 mvyskocil(a)suse.cz
- add log4j to CLASSPATH during %%install
- use GC_MAXIMUM_HEAP_SIZE instead of ANT_OPTS
@@ -225,5 +229,5 @@
- add norootforbuild
* Thu Sep 16 2004 skh(a)suse.de
- Fix prerequires in javadoc subpackage
-* Mon Sep 06 2004 skh(a)suse.de
+* Sun Sep 05 2004 skh(a)suse.de
- Initial package created with version 0.9.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package amarok for openSUSE:Factory
checked in at Thu May 21 01:52:59 CEST 2009.
--------
--- KDE/amarok/amarok.changes 2009-05-20 12:12:53.000000000 +0200
+++ amarok/amarok.changes 2009-04-21 10:17:23.000000000 +0200
@@ -2 +2 @@
-Wed May 20 12:12:22 CEST 2009 - beineri(a)opensuse.org
+Tue Apr 21 10:16:22 CEST 2009 - dmueller(a)suse.de
@@ -4,121 +4 @@
-- require amarok-lang
-
--------------------------------------------------------------------
-Mon May 11 11:25:01 CEST 2009 - beineri(a)opensuse.org
-
-- update to 2.1 Beta 2: several bugfixes and
- * New Script method to get current track time in milliseconds.
- * Pressing the return key in the playlist search activates the
- selected result.
- * Pressing escape key in playlist search clears its contents.
- * Optimizations to the insertion and removal of large numbers
- of tracks from the playlist. Especially clearing a large
- playlist is now about 300 times faster.
- * Always scroll to newly inserted tracks in the Playlist.
- * When removing upcoming tracks from an active dynamic playlist,
- add a simmilar number of new ones to keep if from "drying up".
- * Some action cleanup in the playlist context menu.
- * When clearing the playlist, also reset the search/filter text.
- * Podcast titles are stripped of unnecessary whitespace.
-
--------------------------------------------------------------------
-Tue Apr 21 10:18:16 CEST 2009 - dmueller(a)suse.de
-
-- kde4-amarok -> amarok
-
--------------------------------------------------------------------
-Thu Apr 16 13:21:52 CEST 2009 - shrikantkhare(a)gmail.com
-
-- update to version 2.0.90.svn954151.20090415
-
-- FEATURES:
- * New Script method to get current track time in milliseconds. (BR 177073)
-
-- BUGFIXES:
- * Don't fetch all coverless albums automatically when opening the Cover
- Manager. (BR 176170)
- * Podcast episodes are loaded correctly when restoring a playlist on
- startup. This means the local file will be played if downloaded.
- (BR 189328)
- * Next button in the main toolbar no longer has a clipped shadow.
- (BR 176031)
- * Fixed slider mouse events in RTL layouts. (BR 185465)
- * Detect iPhones as iPods. (BR 184744)
- * Clicking on "Stop after current track" disables the flag if it is
- already enabled.
- * Show a track marker when the "stop after current track" flag is set.
- (BR 185888)
- * Don't flash the OSD when opening the settings dialog. Patch thanks
- to Andreas Heider <andreas(a)meetr.de>.
- * Podcast file formats are correctly displayed.
- * Don't crash when pressing Delete on empty playlist. (BR 189021)
-
-- VERSION 2.1beta1
- * The collection scanner is now able to be run in batch mode, allowing for
- automated scans of both full and incremental types. In addition, all
- graphical dependencies have been removed, allowing for headless, remote
- runs of collection scans. A wiki page detailing how to do this will be
- made available shortly.
- * Covers are shown for iPod collections.
- * Phonon multimedia system can be configured directly from Amarok.
- * Cover art can now be disabled in the collection browser.
- * Scrobble tracks from streams that have title and artist metadata
- * Add support for showing a stream with multiple alternative servers as a
- single item in the playlist and add GUI for manually selecting prefered
- source.
- * Ampache service: Add support for Ampache 3.5.x as well as 3.4.4.
- * Auto timecoding (position bookmarking) now exists for tracks with length
- greater than 10 minutes. (BR 148740)
- * Add a animated "loading..." screen when dynamically fetching info about
- an item to show in the service info applet.
- * Deleting tracks from the local collection is now possible. (BR 170999)
- * Add a filter-by-date-added to the collection browser. Use added:"today"
- or added:<2m2d
- * Add a tab bar in the current track applet for showing also the favorite
- tracks in the collection.
- * Add an advanced but user friendly playlist layout editor allowing users
- to modify and create their own playlist layouts.
- * The Playlist can now render itself using layouts defined in XML. A
- number of default layouts are included and can be switched between.
- * Option to automatically scroll the playlist to the active item on track
- change.
- * New QtScript methods for accessing the playlist:
- Amarok.Playlist.selectedFilenames() & Amarok.Playlist.selectedIndizes().
- Patch by Mathias Panzenböck <grosser.meister.morti(a)gmx.net>.
- * New QtScript method for the Track prototype: imagePixmap( size ). Returns
- a QPixmap of the given size, or the default if the size argument isn't
- supplied.
- * New QtScript class 'DataDownloader' that returns results as a QByteArray
- instead of a string. Needed for image downloads.
- * Cue Sheets are now supported as in Amarok 1.4, plus each cue entry
- (usually a track) will be displayed as a timecode on the Progress Bar
- with a nice onMouseOver popup.
- * Ipod support now uses/depends on libgpod 0.7.0
- * Bookmarking specific positions within local tracks and downloaded local
- podcast episodes, with a nice visual indicator on the progress bar.
- * When the last.fm service is active, any track, from any collection or
- service, can be loved from the browser , and there will always be a love
- button for the currently playing track, no matter the source.
- * Dbus methods added: VolumeUp, VolumeDown and Mute. (BR 181130)
- * The feed url is displayed in the config dialog of a podcast channel.
- By left clicking in the url it's copied to the clipboard. (BR 180853)
- * The Playlist Browser can now show playlists from multiple sources,
- including media devices.
- * The last.fm service now allows for the playing of all types of user
- stations (personal, loved tracks, recommendations, and neighborhood).
- * Arbitrary Tags can now be played in the last.fm service. (BR 139802)
- * Replay Gain support for most file formats that Amarok can read tags from.
- Reading Replay Gain tags from MP4 files requires libMP4v2. Musepack
- (MPC) files are unsupported due to a limitation of TagLib.
- * Amarok urls. Amarok can now load and generate "amarok urls" that allows
- any "view" to be bookmarked and later retrieved. A protocol handler is
- also installed that will launch amarok into the correct state, or make
- amarok show the correct view if already running if such a url is
- activated system wide.
- * Customizable playlist layouts. The playlist is now rendered according to
- an xml layout, allowing the playlist to assume a variety of different
- looks and supply customizable information.
- * Album cover art can be accessed via the scripting API. Patch thanks to
- Simon Esneault <simon.esneault(a)gmail.com>. (BR 179732)
- * New vertical Context View layout.
- * New applet toolbar in the Context View to arrange, select, and add applets.
+- rename kde4-amarok -> amarok
calling whatdependson for head-i586
Old:
----
amarok-2.0.96.tar.bz2
New:
----
amarok-2.0.2.tar.bz2
amarok-gcc44.patch
errmsg-mysql-embedded.diff
errmsg.sys
fix-lastfm-authentication.diff
link-mysql-embedded.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.B23987/_old 2009-05-21 01:52:12.000000000 +0200
+++ /var/tmp/diff_new_pack.B23987/_new 2009-05-21 01:52:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package amarok (Version 2.0.96)
+# spec file for package amarok (Version 2.0.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -22,28 +22,33 @@
BuildRequires: cups-devel libkcddb4-devel ruby-devel sqlite-devel taglib-devel
BuildRequires: kdebase4-workspace-devel libkcompactdisc4-devel tse3-devel update-desktop-files
BuildRequires: gstreamer010-devel libmtp-devel libnjb-devel libvisual-devel xine-devel
-BuildRequires: flac-devel gtk2-devel libQtWebKit-devel libdvdread-devel libkde4-devel
+BuildRequires: flac-devel gtk2-devel libQtWebKit-devel libdvdread-devel libgpod-devel
BuildRequires: dbus-1-glib-devel libogg-devel libsamplerate-devel libsndfile-devel
-BuildRequires: gdk-pixbuf-devel libcurl-devel libsoprano-devel loudmouth-devel
-BuildRequires: libmysqlclient-devel libqca2-devel
-BuildRequires: qt4-qtscript taglib-extras-devel
-BuildRequires: libgpod-devel >= 0.7.0
-#Currently no package in openSUSE BuildService provides this
-#BuildRequires: libmp4v2-devel
-# Required for the fdupes macro
-BuildRequires: fdupes
+BuildRequires: gdk-pixbuf-devel libcurl-devel libsoprano-devel loudmouth-devel mysql-devel
+%if %suse_version > 1030
+BuildRequires: libmusicbrainz3-devel
+%endif
+#%if %suse_version > 1020
+#BuildRequires: poppler-qt4
+#%endif
Url: http://amarok.kde.org
License: GPL v2 or later
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
-Version: 2.0.96
+Version: 2.0.2
Release: 2
Source0: %name-%version.tar.bz2
+Source1: errmsg.sys
+Patch3: link-mysql-embedded.diff
+Patch4: errmsg-mysql-embedded.diff
+Patch5: amarok-gcc44.patch
+Patch6: fix-lastfm-authentication.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Provides: kde4-amarok = 2.0.90
-Obsoletes: kde4-amarok <= 2.0.90
-Requires: qt4-qtscript
-Requires: %{name}-lang = %{version}
+%kde4_runtime_requires
+Requires: %name-lang = %{version}
+Requires: libqt4-sql-sqlite
+Provides: kde4-amarok = 2.0.2
+Obsoletes: kde4-amarok <= 2.0.2
%description
Amarok is a media player for all kinds of media. This includes MP3, Ogg
@@ -61,7 +66,11 @@
%lang_package
%prep
-%setup -q -n %name-%version
+%setup -q
+%patch3
+%patch4
+%patch5
+%patch6
%build
%ifarch ppc ppc64
@@ -74,170 +83,63 @@
cd build
%makeinstall
cd ..
+ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/kde4/apps/amarok/errmsg.sys
%suse_update_desktop_file -r amarok AudioVideo Player
%find_lang amarok
- %find_lang amarokcollectionscanner_qt amarok.lang
%kde_post_install
- # create hardlinks for duplicate file using fdupes macro
- %fdupes %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+rm -rf filelists
%files lang -f amarok.lang
%files
%defattr(-,root,root)
-%_bindir/amarok
-%_bindir/amarokcollectionscanner
-%_bindir/amarok_afttagger
-%_bindir/amarokmp3tunesharmonydaemon
+/usr/bin/amarok
+/usr/bin/amarokcollectionscanner
+/usr/bin/amarok_afttagger
+/usr/bin/amarokmp3tunesharmonydaemon
+%dir /usr/%_lib/kde4/plugins/script
+%_kde4_modules/plugins/script/*
%_kde4_modules/amarok_*
%_kde4_modules/kcm_amarok_service_*
%_kde4_modules/libamarok_*
-%_libdir/libamarok_service_liblastfm.so
+%_libdir/libamarok_taglib.so
+%_libdir/libamarok_taglib.so.*
%_libdir/libamaroklib.so
%_libdir/libamaroklib.so.*
+%_libdir/libamarokplasma.so
+%_libdir/libamarokplasma.so.*
%_libdir/libamarokpud.so
%_libdir/libamarokpud.so.*
-%_libdir/libmediadevicelib.so
-%_libdir/libmediadevicelib.so.*
+/usr/%_lib/libamarok_service_liblastfm.so
%_libdir/strigi/strigita_audible.so
%_libdir/strigi/strigita_mp4.so
-%{_datadir}/applications/kde4/amarok.desktop
-%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
-%{_datadir}/icons/hicolor/*/apps/amarok.*
+/usr/share/applications/kde4/amarok.desktop
+/usr/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
+/usr/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
+/usr/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
+/usr/share/icons/hicolor/*/apps/amarok.*
%_kde_share_dir/apps/amarok
%_kde_share_dir/apps/desktoptheme/Amarok-Mockup
%_kde_share_dir/apps/desktoptheme/amarok-default.desktop
%_kde_share_dir/apps/desktoptheme/default/widgets/amarok-*
-%_kde_share_dir/config.kcfg/amarokconfig.kcfg
+%_kde_share_dir/config.kcfg/amarok.kcfg
%_kde_config_dir/amarok.knsrc
-%_kde_share_dir/servicetypes/amarok_*
+%_kde_share_dir/services/ServiceMenus/amarok_append.desktop
%_kde_share_dir/services/amarok-*
%_kde_share_dir/services/amarok_*
+%_kde_share_dir/servicetypes/amarok_*
%_kde_share_dir/services/amaroklastfm.protocol
-%_kde_share_dir/services/amarok.protocol
-%_kde_share_dir/services/ServiceMenus/amarok_append.desktop
-%_kde_config_dir/amarok_homerc
%changelog
-* Wed May 20 2009 beineri(a)opensuse.org
-- require amarok-lang
-* Mon May 11 2009 beineri(a)opensuse.org
-- update to 2.1 Beta 2: several bugfixes and
- * New Script method to get current track time in milliseconds.
- * Pressing the return key in the playlist search activates the
- selected result.
- * Pressing escape key in playlist search clears its contents.
- * Optimizations to the insertion and removal of large numbers
- of tracks from the playlist. Especially clearing a large
- playlist is now about 300 times faster.
- * Always scroll to newly inserted tracks in the Playlist.
- * When removing upcoming tracks from an active dynamic playlist,
- add a simmilar number of new ones to keep if from "drying up".
- * Some action cleanup in the playlist context menu.
- * When clearing the playlist, also reset the search/filter text.
- * Podcast titles are stripped of unnecessary whitespace.
* Tue Apr 21 2009 dmueller(a)suse.de
-- kde4-amarok -> amarok
-* Thu Apr 16 2009 shrikantkhare(a)gmail.com
-- update to version 2.0.90.svn954151.20090415
-- FEATURES:
- * New Script method to get current track time in milliseconds. (BR 177073)
-- BUGFIXES:
- * Don't fetch all coverless albums automatically when opening the Cover
- Manager. (BR 176170)
- * Podcast episodes are loaded correctly when restoring a playlist on
- startup. This means the local file will be played if downloaded.
- (BR 189328)
- * Next button in the main toolbar no longer has a clipped shadow.
- (BR 176031)
- * Fixed slider mouse events in RTL layouts. (BR 185465)
- * Detect iPhones as iPods. (BR 184744)
- * Clicking on "Stop after current track" disables the flag if it is
- already enabled.
- * Show a track marker when the "stop after current track" flag is set.
- (BR 185888)
- * Don't flash the OSD when opening the settings dialog. Patch thanks
- to Andreas Heider <andreas(a)meetr.de>.
- * Podcast file formats are correctly displayed.
- * Don't crash when pressing Delete on empty playlist. (BR 189021)
-- VERSION 2.1beta1
- * The collection scanner is now able to be run in batch mode, allowing for
- automated scans of both full and incremental types. In addition, all
- graphical dependencies have been removed, allowing for headless, remote
- runs of collection scans. A wiki page detailing how to do this will be
- made available shortly.
- * Covers are shown for iPod collections.
- * Phonon multimedia system can be configured directly from Amarok.
- * Cover art can now be disabled in the collection browser.
- * Scrobble tracks from streams that have title and artist metadata
- * Add support for showing a stream with multiple alternative servers as a
- single item in the playlist and add GUI for manually selecting prefered
- source.
- * Ampache service: Add support for Ampache 3.5.x as well as 3.4.4.
- * Auto timecoding (position bookmarking) now exists for tracks with length
- greater than 10 minutes. (BR 148740)
- * Add a animated "loading..." screen when dynamically fetching info about
- an item to show in the service info applet.
- * Deleting tracks from the local collection is now possible. (BR 170999)
- * Add a filter-by-date-added to the collection browser. Use added:"today"
- or added:<2m2d
- * Add a tab bar in the current track applet for showing also the favorite
- tracks in the collection.
- * Add an advanced but user friendly playlist layout editor allowing users
- to modify and create their own playlist layouts.
- * The Playlist can now render itself using layouts defined in XML. A
- number of default layouts are included and can be switched between.
- * Option to automatically scroll the playlist to the active item on track
- change.
- * New QtScript methods for accessing the playlist:
- Amarok.Playlist.selectedFilenames() & Amarok.Playlist.selectedIndizes().
- Patch by Mathias Panzenböck <grosser.meister.morti(a)gmx.net>.
- * New QtScript method for the Track prototype: imagePixmap( size ). Returns
- a QPixmap of the given size, or the default if the size argument isn't
- supplied.
- * New QtScript class 'DataDownloader' that returns results as a QByteArray
- instead of a string. Needed for image downloads.
- * Cue Sheets are now supported as in Amarok 1.4, plus each cue entry
- (usually a track) will be displayed as a timecode on the Progress Bar
- with a nice onMouseOver popup.
- * Ipod support now uses/depends on libgpod 0.7.0
- * Bookmarking specific positions within local tracks and downloaded local
- podcast episodes, with a nice visual indicator on the progress bar.
- * When the last.fm service is active, any track, from any collection or
- service, can be loved from the browser , and there will always be a love
- button for the currently playing track, no matter the source.
- * Dbus methods added: VolumeUp, VolumeDown and Mute. (BR 181130)
- * The feed url is displayed in the config dialog of a podcast channel.
- By left clicking in the url it's copied to the clipboard. (BR 180853)
- * The Playlist Browser can now show playlists from multiple sources,
- including media devices.
- * The last.fm service now allows for the playing of all types of user
- stations (personal, loved tracks, recommendations, and neighborhood).
- * Arbitrary Tags can now be played in the last.fm service. (BR 139802)
- * Replay Gain support for most file formats that Amarok can read tags from.
- Reading Replay Gain tags from MP4 files requires libMP4v2. Musepack
- (MPC) files are unsupported due to a limitation of TagLib.
- * Amarok urls. Amarok can now load and generate "amarok urls" that allows
- any "view" to be bookmarked and later retrieved. A protocol handler is
- also installed that will launch amarok into the correct state, or make
- amarok show the correct view if already running if such a url is
- activated system wide.
- * Customizable playlist layouts. The playlist is now rendered according to
- an xml layout, allowing the playlist to assume a variety of different
- looks and supply customizable information.
- * Album cover art can be accessed via the scripting API. Patch thanks to
- Simon Esneault <simon.esneault(a)gmail.com>. (BR 179732)
- * New vertical Context View layout.
- * New applet toolbar in the Context View to arrange, select, and add applets.
+- rename kde4-amarok -> amarok
* Thu Apr 09 2009 rhafer(a)suse.de
- included upstream fix for broken last.fm authentication (kde#188678)
* Fri Mar 06 2009 wstephenson(a)suse.de
++++++ amarok-2.0.96.tar.bz2 -> amarok-2.0.2.tar.bz2 ++++++
++++ 756783 lines of diff (skipped)
++++++ amarok-gcc44.patch ++++++
Index: src/metadata/audible/audibletag.cpp
===================================================================
--- src/metadata/audible/audibletag.cpp (Revision 934060)
+++ src/metadata/audible/audibletag.cpp (Arbeitskopie)
@@ -27,6 +27,7 @@
#include <tag.h>
#include <string.h>
+#include <stdio.h>
#include <stdlib.h>
#include <netinet/in.h> // ntohl
Index: src/metadata/audible/audibleproperties.cpp
===================================================================
--- src/metadata/audible/audibleproperties.cpp (Revision 934060)
+++ src/metadata/audible/audibleproperties.cpp (Arbeitskopie)
@@ -29,6 +29,7 @@
#include "taglib_audiblefile.h"
+#include <stdio.h>
#include <netinet/in.h> // ntohl
using namespace TagLib;
Index: src/metadata/audible/taglib_audiblefile.cpp
===================================================================
--- src/metadata/audible/taglib_audiblefile.cpp (Revision 934060)
+++ src/metadata/audible/taglib_audiblefile.cpp (Arbeitskopie)
@@ -29,6 +29,7 @@
#include "../tfile_helper.h"
#include <audioproperties.h>
#include <string.h>
+#include <stdio.h>
namespace TagLib {
////////////////////////////////////////////////////////////////////////////////
Index: src/metadata/audible/taglib_audiblefiletyperesolver.cpp
===================================================================
--- src/metadata/audible/taglib_audiblefiletyperesolver.cpp (Revision 934060)
+++ src/metadata/audible/taglib_audiblefiletyperesolver.cpp (Arbeitskopie)
@@ -23,6 +23,7 @@
#include "taglib_audiblefile.h"
#include <string.h>
+#include <stdio.h>
TagLib::File *AudibleFileTypeResolver::createFile(TagLib::FileName fileName,
bool readProperties,
Index: src/metadata/wav/wavfiletyperesolver.cpp
===================================================================
--- src/metadata/wav/wavfiletyperesolver.cpp (Revision 934060)
+++ src/metadata/wav/wavfiletyperesolver.cpp (Arbeitskopie)
@@ -23,6 +23,7 @@
#include "wavfile.h"
#include <string.h>
+#include <stdio.h>
TagLib::File *WavFileTypeResolver::createFile(TagLib::FileName fileName,
bool readProperties,
Index: src/metadata/wav/wavproperties.cpp
===================================================================
--- src/metadata/wav/wavproperties.cpp (Revision 934060)
+++ src/metadata/wav/wavproperties.cpp (Arbeitskopie)
@@ -27,6 +27,7 @@
#include <tstring.h>
#include <stdint.h>
+#include <stdio.h>
#include "wavfile.h"
Index: src/metadata/wav/wavfile.cpp
===================================================================
--- src/metadata/wav/wavfile.cpp (Revision 934060)
+++ src/metadata/wav/wavfile.cpp (Arbeitskopie)
@@ -28,6 +28,7 @@
#include "../tfile_helper.h"
#include <audioproperties.h>
#include <tag.h>
+#include <stdio.h>
namespace TagLib {
////////////////////////////////////////////////////////////////////////////////
Index: src/scriptengine/generator/generator/parser/rpp/pp.h
===================================================================
--- src/scriptengine/generator/generator/parser/rpp/pp.h (Revision 934060)
+++ src/scriptengine/generator/generator/parser/rpp/pp.h (Arbeitskopie)
@@ -28,6 +28,7 @@
#include <iostream>
#include <cassert>
#include <cctype>
+#include <cstdio>
#include <fcntl.h>
++++++ errmsg-mysql-embedded.diff ++++++
--- src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:00:57 1.1
+++ src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:02:52
@@ -109,7 +109,7 @@
dir.mkpath( "." );
}
- static const int num_elements = 8;
+ static const int num_elements = 9;
char **server_options = new char* [ num_elements + 1 ];
server_options[0] = const_cast<char*>( "amarokmysqld" );
server_options[1] = defaultsLine;
@@ -121,6 +121,7 @@
server_options[5] = const_cast<char*>( "--loose-skip-innodb" );
server_options[6] = const_cast<char*>( "--skip-grant-tables" );
server_options[7] = const_cast<char*>( "--myisam-recover=FORCE" );
+ server_options[8] = const_cast<char*>( "--language=/usr/share/kde4/apps/amarok" );
server_options[num_elements] = 0;
char **server_groups = new char* [ 3 ];
++++++ fix-lastfm-authentication.diff ++++++
Index: src/services/lastfm/LastFmService.cpp
===================================================================
--- src/services/lastfm/LastFmService.cpp.orig
+++ src/services/lastfm/LastFmService.cpp
@@ -115,14 +115,12 @@ LastFmService::LastFmService( LastFmServ
debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
QString authToken = md5( ( m_userName + md5( password.toUtf8() ) ).toUtf8() );
- QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
// now authenticate w/ last.fm and get our session key
WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
.add( "username", m_userName )
.add( "authToken", authToken )
.add( "api_key", Ws::ApiKey )
- .add( "api_sig", sign_key )
.get();
connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
Index: src/services/lastfm/LastFmServiceSettings.cpp
===================================================================
--- src/services/lastfm/LastFmServiceSettings.cpp.orig
+++ src/services/lastfm/LastFmServiceSettings.cpp
@@ -94,14 +94,12 @@ LastFmServiceSettings::testLogin()
debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
QString authToken = md5( ( m_configDialog->kcfg_ScrobblerUsername->text() + md5( m_configDialog->kcfg_ScrobblerPassword->text().toUtf8() ) ).toUtf8() );
- QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
// now authenticate w/ last.fm and get our session key
WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
.add( "username", m_configDialog->kcfg_ScrobblerUsername->text() )
.add( "authToken", authToken )
.add( "api_key", Ws::ApiKey )
- .add( "api_sig", sign_key )
.get();
connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
++++++ link-mysql-embedded.diff ++++++
--- src/collection/sqlcollection/CMakeLists.txt
+++ src/collection/sqlcollection/CMakeLists.txt
@@ -63,11 +63,6 @@ target_link_libraries(amarok_collection-
${KDE4_THREADWEAVER_LIBRARIES}
${CMAKE_DL_LIBS}
${MYSQL_EMBEDDED_LIBRARIES}
- #this line may be needed on Debian or other systems where mysql is compiled
- #in the prescence of yassl. However it seems to cause problems for other people,
- #so its been disabled.
- #See http://bugs.mysql.com/bug.php?id=21489
- ${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES}
)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package OpenOffice_org-extensions for openSUSE:Factory
checked in at Thu May 21 01:50:45 CEST 2009.
--------
--- OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2009-05-15 17:58:14.000000000 +0200
+++ OpenOffice_org-extensions/OpenOffice_org-extensions.changes 2009-05-19 17:01:12.000000000 +0200
@@ -1,0 +2,5 @@
+Tue May 19 16:30:15 CEST 2009 - pmladek(a)suse.cz
+
+- updated ooo-build to version 3.1.0.2 (3.1-rc3)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org-extensions.spec ++++++
--- /var/tmp/diff_new_pack.Fh2723/_old 2009-05-21 01:50:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Fh2723/_new 2009-05-21 01:50:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package OpenOffice_org-extensions (Version 3.1.0.1)
+# spec file for package OpenOffice_org-extensions (Version 3.1.0.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,9 +19,9 @@
Name: OpenOffice_org-extensions
-Version: 3.1.0.1
+Version: 3.1.0.2
Release: 1
-%define ooo_build_version 3.1.0.1
+%define ooo_build_version 3.1.0.2
%define piece extensions
#!BuildIgnore: OpenOffice_org
BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel python-xml recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip
@@ -265,6 +265,8 @@
%ooo_prefix/%ooo_home/share/extension/install/wiki-publisher.oxt
%changelog
+* Tue May 19 2009 pmladek(a)suse.cz
+- updated ooo-build to version 3.1.0.2 (3.1-rc3)
* Fri May 15 2009 pmladek(a)suse.cz
- updated ooo-build to version 3.1.0.1 (3.1-rc2)
* Thu May 07 2009 pmladek(a)suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0