Hello community, here is the log from the commit of package amarok for openSUSE:12.1:Update:Test checked in at 2012-01-11 18:25:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/amarok (Old) and /work/SRC/openSUSE:12.1:Update:Test/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "amarok", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/amarok/amarok.changes 2011-12-12 16:26:19.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.amarok.new/amarok.changes 2012-01-11 18:25:32.000000000 +0100 @@ -2 +2,6 @@ -Sat Dec 10 07:03:24 UTC 2011 - mlin@suse.com +Mon Dec 12 09:30:53 CET 2011 - mhrusecky@suse.cz + +- added patch to carry around correct errmsg.sys file (bnc#712749) + +------------------------------------------------------------------- +Wed Nov 30 06:17:01 UTC 2011 - mlin@suse.com @@ -9 +14 @@ -Sun Nov 6 17:49:24 UTC 2011 - ctrippe@opensuse.org +Sat Nov 5 06:14:00 UTC 2011 - ctrippe@opensuse.org New: ---- errmsg-mysql-embedded.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.P1tMo6/_old 2012-01-11 18:25:32.000000000 +0100 +++ /var/tmp/diff_new_pack.P1tMo6/_new 2012-01-11 18:25:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package amarok # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_with ffmpeg Name: amarok @@ -26,6 +27,8 @@ Url: http://amarok.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE errmsg-mysql-embedded.diff -- Don't require errmsg.sys from mysql package +Patch0: errmsg-mysql-embedded.diff # PATCH-FEATURE-OPENSUSE ksuseinstall.diff llunak@novell.com -- Support for on-demand codecs install using ksuseinstall Patch1: ksuseinstall.diff # PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 llunak@novell.com -- Increase initial preference to be used for audio files instead of Kaffeine @@ -62,7 +65,7 @@ BuildRequires: libqca2-devel BuildRequires: libqjson-devel BuildRequires: loudmouth-devel -BuildRequires: mysql +BuildRequires: mysql-community-server BuildRequires: qt4-qtscript BuildRequires: taglib-devel BuildRequires: taglib-extras-devel @@ -87,6 +90,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %if !0%{?kde_updatedapps} %patch1 -p1 %endif ++++++ errmsg-mysql-embedded.diff ++++++ Index: amarok-2.4.3/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp =================================================================== --- amarok-2.4.3.orig/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp +++ amarok-2.4.3/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp @@ -65,6 +65,7 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora // functions, such as FULLTEXT indexing. out << "default-storage-engine = MyISAM" << endl; out << "loose-innodb = 0" << endl; + out << "language=/usr/share/kde4/apps/amarok" << endl; out << "skip-grant-tables = 1" << endl; out << "myisam-recover = FORCE" << endl; out << "key_buffer_size = 16777216" << endl; // (16Mb) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org