@@ -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,36 +15,28 @@

 # Please submit bugfixes or comments via http://bugs.opensuse.org/

 #

-# norootforbuild

 %bcond_with ffmpeg

 Name:           amarok

-Version:        2.4.3

-Release:        17.4

+Version:        2.6.0

+Release:        6.1

 Summary:        Media Player for KDE

+License:        GPL-2.0+

+Group:          Productivity/Multimedia/Sound/Players

-License:        GPLv2+

 Url:            http://amarok.kde.org/

-Group:          Productivity/Multimedia/Sound/Players

-Source0:        ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2

-# PATCH-FIX-OPENSUSE errmsg-mysql51-embedded.diff -- Don't require errmsg.sys from mysql package

-Patch0:         errmsg-mysql51-embedded.diff

-# PATCH-FEATURE-OPENSUSE ksuseinstall.diff llunak@novell.com -- Support for on-demand codecs install using ksuseinstall

-Patch1:         ksuseinstall.diff

+Source0:        ftp://ftp.kde.org/pub/kde/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2

 # PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 llunak@novell.com -- Increase initial preference to be used for audio files instead of Kaffeine

-Patch2:         initial-preference.diff

+Patch1:         initial-preference.diff

 # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support for the changed mimetype for flac files

-Patch3:         flac_mimetype_bnc671581.diff

+Patch2:         flac_mimetype_bnc671581.diff

+Patch3:         revert_solid_workaround.diff

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 # Required for the fdupes macro

 BuildRequires:  fdupes

-%if 0%{?suse_version} == 1130

-BuildRequires:  gtk2-devel

-%else

 BuildRequires:  gdk-pixbuf-devel

-%endif

 BuildRequires:  glib2-devel

 BuildRequires:  libcurl-devel

 %if %{with ffmpeg}

@@ -53,30 +45,29 @@

 %endif

 BuildRequires:  libgcrypt-devel

 BuildRequires:  libgpod-devel >= 0.7.0

-BuildRequires:  libkde4-devel

+BuildRequires:  libkde4-devel >= 4.6.0

 BuildRequires:  libksuseinstall-devel

 BuildRequires:  liblastfm-devel

 BuildRequires:  libmtp-devel

-BuildRequires:  libmygpo-qt-devel

+BuildRequires:  libmygpo-qt-devel >= 1.0.5

 BuildRequires:  libmysqlclient-devel

 BuildRequires:  libmysqld-devel

 BuildRequires:  libopenssl-devel

 BuildRequires:  libqca2-devel

 BuildRequires:  libqjson-devel

 BuildRequires:  loudmouth-devel

-BuildRequires:  mysql

 BuildRequires:  qt4-qtscript

-BuildRequires:  taglib-devel

+BuildRequires:  libtag-devel

 BuildRequires:  taglib-extras-devel

 BuildRequires:  tcpd-devel

 %if 0%{?suse_version}

 BuildRequires:  update-desktop-files

 %endif

 Requires:       libtag-extras1 >= 1.0

-Requires:       qt4-qtscript

 Requires:       taglib >= 1.6

 %kde4_runtime_requires

 Recommends:     moodbar

+Recommends:     qt4-qtscript

 Recommends:     %{name}-lang = %{version}

 Provides:       kde4-amarok = 2.0.90

 Obsoletes:      kde4-amarok <= 2.0.89

@@ -89,14 +80,9 @@

 %lang_package

 %prep

 %setup -q

-%patch0

-%if !0%{?kde_updatedapps}

-%patch1 -p1

-%endif

+%patch1

 %patch2

-%if 0%{?suse_version} > 1130

-%patch3

-%endif

+%patch3 -p1

 # Remove build time references so build-compare can do its work

 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')

@@ -114,13 +100,13 @@

 %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

+#bnc722284 amarok is not really a good player for audio-cds, remove the action for solid

+rm -f %{buildroot}%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop

+

 %if 0%{?suse_version}

 %suse_update_desktop_file amarok Qt KDE AudioVideo Audio Player

 %endif

@@ -144,9 +130,6 @@

 %postun -p /sbin/ldconfig

-%clean

-rm -rf %{buildroot}

-

 %files

 %defattr(-,root,root,-)

 %doc AUTHORS COPYING* ChangeLog README TODO

@@ -177,15 +160,11 @@

 %{_kde4_iconsdir}/hicolor/*/apps/amarok.*

 %{_kde4_appsdir}/amarok/

 %dir %{_kde4_appsdir}/desktoptheme

-%{_kde4_appsdir}/desktoptheme/Amarok-Mockup/

 %dir %{_kde4_appsdir}/desktoptheme/default

 %dir %{_kde4_appsdir}/desktoptheme/default/widgets

 %{_kde4_appsdir}/desktoptheme/default/widgets/amarok-*

 %{_kde4_appsdir}/kconf_update/amarok-2.4.1-tokens_syntax_update.pl

 %{_kde4_appsdir}/kconf_update/amarok.upd

-%dir %{_kde4_appsdir}/solid

-%dir %{_kde4_appsdir}/solid/actions

-%{_kde4_appsdir}/solid/actions/amarok-play-audiocd.desktop

 %{_kde4_sharedir}/config.kcfg/amarokconfig.kcfg

 %{_kde4_configdir}/amarok*

 %{_kde4_servicesdir}/ServiceMenus/amarok_append.desktop

@@ -200,678 +179,3 @@

 %exclude %{_kde4_htmldir}/en/amarok/

 %changelog

-* Mon Aug 29 2011 idonmez@suse.com

-- Don't disable ksuseintall & liblastfm support for KDE:UpdatedApps

-* Tue Aug  9 2011 reddwarf@opensuse.org

-- Optionally enable MusicDNS support (requires ffmpeg/libav)

-* Mon Aug  1 2011 asterios.dramis@gmail.com

-- Update to 2.4.3:

-  Bugfixes:

-  * Fix KWallet auth requests on every track change. (bko#278177)

-  * Display correct values for pretty times (playlist length) > 1 day.

-  * Update playlist length correctly after removing track. (bko#273407)

-  * Fix seek backward from dbus. (Thanks to Matthieu Bedouet) (bko#263287)

-  * Prevent dialog querying last.fm settings being displayed on startup if

-    none set.

-  * Fix detection of smartphones in USB storage mode. (bko#277685)

-  * Fix crashes on expanding a newly cloned dynamic playlist (bko#277750)

-  * Don't block the UI while calculating the filename previews. (bko#233196)

-  * Make M3U & PLS playlist files editable from Saved Playlists. (bko#245963)

-  From 2.4.2-Beta 1:

-  Features:

-  * Made Amarok compile with the Clang LLVM frontend.

-  * Enable drag and drop on collections to copy/move within Local Music and

-    directly from the playlist. (bko#223400)

-  * Added KNotify scripting interface. (bko#260750)

-  * Make podcast episodes download filename configurable. Patch by

-    Sandeep Raghuraman. (bko#155075)

-  * Automatic scrolling in lyrics applet (Thanks to Jan Gerrit Marker)

-  * Option to scrobble composer as artist to Last.fm (Thanks to Nicholas

-    Wilson)

-  * Option to hide the OSD if another window is taking the full screen

-  Changes:

-  * Again write back ratings only if option is selected.

-  * Moved the queue-editor action to the main menu under playlist to save

-    space. Queue editor now has a shortcut: Meta+U.

-  * Removed the redo action from the playlist toolbar to make it less wide.

-  * Made some playlist toolbar actions collapse into a menu button for use on

-    small screens.

-  * Removed the statusbar. Moved progress info & messages to the Media

-    Sources dock.

-  * Removed the preview button and checkbox from the organize collection

-    dialog.

-  * General user interface cleanup (addition of browser widget backgrounds,

-    etc.)

-  * Removed the add button in the context toolbar. Applet explorer is opened

-    on config.

-  * Easier to understand Dynamic playlists

-  * Made Amarok depend ffmpeg-0.6 or newer.

-  * Use KImageCache if possible (kdelibs 4.5.0 and later), which should

​