- merged 1.4.5 from AC-branch

Changed files:
    amarok.spec -> 1.154

diff --git a/amarok.spec b/amarok.spec
index 922dddea55cee48ca852a8ed496320f46e617cae..a62b1f87c0e4a5c227771bb170a209b95c02374d 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -6,12 +6,14 @@
 # - include /usr/bin/amarok_proxy.rb (proxy server for last.fm, but req. ruby)
 # - main package pulls /usr/bin/ruby
 # - monitor http://bugs.kde.org/show_bug.cgi?id=137390 to remove the temporary fix
+# - karma & MFS (see README)
+# - ProjectM (see README)
 #
 # Conditional builds:
 %bcond_with    gstreamer       # enable gstreamer (gst10 not stable)
 %bcond_without mas             # disable MAS audio backend
 %bcond_without xine            # disable xine engine
-%bcond_without xmms            # disable xmms wrapping
+%bcond_with    xmms            # disable xmms wrapping
 %bcond_without zeroconf        # disable support for zeroconf
 %bcond_without included_sqlite # don't use included sqlite (VERY BAD IDEA), needs sqlite >= 3.3 otherwise
 %bcond_without helix           # disable HelixPlayer engine
@@ -27,16 +29,14 @@
 Summary:       A KDE audio player
 Summary(pl):   Odtwarzacz audio dla KDE
 Name:          amarok
-Version:       1.4.4
-Release:       6
+Version:       1.4.5
+Release:       1
 License:       GPL
 Group:         X11/Applications/Multimedia
-#Source0:      http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
-Source0:       http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 56a9aec42088c338b81252f8e0651781
+Source0:       ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 1dac1cb5ac9c9cdabdab5f69b39e92c8
 Patch0:                %{name}-helixplayer-morearchs.patch
 Patch1:                %{name}-libnjb.patch
-Patch2:                %{name}-smp.patch
 Patch3:                %{name}-sparc.patch
 Patch4:                kde-ac260-lt.patch
 Patch5:                kde-common-PLD.patch
@@ -53,15 +53,15 @@ BuildRequires:      gettext-devel
 BuildRequires: kdebase-devel
 %{?with_akode:BuildRequires:   kdemultimedia-akode}
 BuildRequires: kdemultimedia-devel >= 9:3.1.93
-%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.2.0}
-%{?with_mp3players:BuildRequires:      libifp-devel}
+%{?with_mp3players:BuildRequires:      libgpod-devel >= 0.4.2}
+%{?with_mp3players:BuildRequires:      libifp-devel >= 1.0.0.2}
 BuildRequires: libltdl-devel
-%{?with_mp3players:BuildRequires:      libmtp-devel}
-%{?with_mp3players:BuildRequires:      libnjb-devel}
+%{?with_mp3players:BuildRequires:      libmtp-devel >= 0.1.1}
+%{?with_mp3players:BuildRequires:      libnjb-devel >= 2.2.4}
 %{?with_pgsql:BuildRequires:           libpqxx-devel}
 BuildRequires: libtunepimp-devel >= 0.5.1-6
 BuildRequires: libvisual-devel >= 0.4.0
-BuildRequires: mpeg4ip-devel
+BuildRequires: mpeg4ip-devel >= 1:1.5
 %{?with_mysql:BuildRequires:           mysql-devel}
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
@@ -209,8 +209,7 @@ Wi
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
-%patch3 -p0
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1