Hello community,
here is the log from the commit of package amarok for openSUSE:Factory
checked in at Sat Jun 6 00:12:06 CEST 2009.
--------
--- KDE/amarok/amarok.changes 2009-05-30 08:36:13.000000000 +0200
+++ amarok/amarok.changes 2009-06-04 10:13:49.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 4 09:36:31 CEST 2009 - beineri@opensuse.org
+
+- don't require errmsg.sys from mysql package (bnc#509815)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
errmsg-mysql-embedded.diff
errmsg.sys
link-mysql-embedded.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.R28028/_old 2009-06-06 00:11:22.000000000 +0200
+++ /var/tmp/diff_new_pack.R28028/_new 2009-06-06 00:11:22.000000000 +0200
@@ -39,8 +39,11 @@
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
Version: 2.1
-Release: 1
+Release: 2
Source0: %name-%version.tar.bz2
+Source1: errmsg.sys
+Patch3: link-mysql-embedded.diff
+Patch4: errmsg-mysql-embedded.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: kde4-amarok = 2.0.90
Obsoletes: kde4-amarok <= 2.0.90
@@ -64,6 +67,8 @@
%lang_package
%prep
%setup -q -n %name-%version
+%patch3
+%patch4
%build
%ifarch ppc ppc64
@@ -76,6 +81,7 @@
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
@@ -130,6 +136,8 @@
%_kde_config_dir/amarok_homerc
%changelog
+* Thu Jun 04 2009 beineri@opensuse.org
+- don't require errmsg.sys from mysql package (bnc#509815)
* Sat May 30 2009 beineri@opensuse.org
- update to 2.1 release: several bugfixes and
* Removed the "Amarok Handbook" menu entry until the handbook
++++++ 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