Author: glen Date: Fri Feb 9 00:07:08 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - merged 1.4.5 from AC-branch
---- Files affected: SPECS: amarok.spec (1.153 -> 1.154) ---- Diffs: ================================================================ Index: SPECS/amarok.spec diff -u SPECS/amarok.spec:1.153 SPECS/amarok.spec:1.154 --- SPECS/amarok.spec:1.153 Wed Dec 27 10:54:06 2006 +++ SPECS/amarok.spec Fri Feb 9 01:07:03 2007 @@ -7,12 +7,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 @@ -28,16 +30,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 @@ -54,15 +54,15 @@ 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 @@ -210,8 +210,7 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p0 -%patch3 -p0 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -483,6 +482,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.154 2007/02/09 00:07:03 glen +- merged 1.4.5 from AC-branch + Revision 1.153 2006/12/27 09:54:06 glen - titleorder.patch restored ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.153&r2=1.154&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
