Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2012-06-25 12:21:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2012-05-31 17:02:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2012-06-25 12:21:03.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 15 23:58:24 UTC 2012 - stefan.bru...@rwth-aachen.de + +- remove errmsg patch, it must match the version of the installed + libmysqld, thus libmysqld need a matching dependency + depends on fixed mysql package + fixes bnc#712749 + +------------------------------------------------------------------- Old: ---- errmsg-mysql-embedded.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.Q4F7Cr/_old 2012-06-25 12:21:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Q4F7Cr/_new 2012-06-25 12:21:05.000000000 +0200 @@ -27,8 +27,6 @@ Url: http://amarok.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE errmsg-mysql51-embedded.diff -- Don't require errmsg.sys from mysql package -Patch0: errmsg-mysql-embedded.diff # PATCH-FEATURE-OPENSUSE ksuseinstall.diff llu...@novell.com -- Support for on-demand codecs install using ksuseinstall Patch1: ksuseinstall.diff # PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 llu...@novell.com -- Increase initial preference to be used for audio files instead of Kaffeine @@ -67,7 +65,6 @@ BuildRequires: libqca2-devel BuildRequires: libqjson-devel BuildRequires: loudmouth-devel -BuildRequires: mysql-community-server BuildRequires: qt4-qtscript BuildRequires: taglib-devel BuildRequires: taglib-extras-devel @@ -92,7 +89,6 @@ %lang_package %prep %setup -q -%patch0 -p1 %if !0%{?kde_updatedapps} %patch1 -p1 %endif @@ -120,9 +116,6 @@ %kde4_makeinstall cd .. -# bnc#509815 -- Don't require errmsg.sys from mysql package -install -pm 0644 %{_datadir}/mysql/english/errmsg.sys %{buildroot}%{_kde4_appsdir}/amarok/errmsg.sys - # Remove *.so files (not needed), fix "devel-file-in-non-devel-package" rpmlint warning # "libampache_account_login.so" should not be removed rm -f %{buildroot}%{_kde4_libdir}/libamarok{core,lib,ocsclient,pud,-sqlcollection,-transcoding}.so -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
