SPECS: amarok.spec - merged from DEVEL
arekm
arekm at pld-linux.org
Mon Aug 15 18:14:11 CEST 2005
Author: arekm Date: Mon Aug 15 16:14:11 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SPECS:
amarok.spec (1.54 -> 1.55)
---- Diffs:
================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.54 SPECS/amarok.spec:1.55
--- SPECS/amarok.spec:1.54 Fri Jul 1 02:20:09 2005
+++ SPECS/amarok.spec Mon Aug 15 18:14:06 2005
@@ -1,30 +1,32 @@
# $Revision$, $Date$
-# TODO
-# warning: Installed (but unpackaged) file(s) found:
-# /usr/lib/kde3/libamarok_aKode-engine.la
-# /usr/lib/kde3/libamarok_aKode-engine.so
-# /usr/share/apps/konqsidebartng/entries/amarok.desktop
-# /usr/share/apps/konqsidebartng/kicker_entries/amarok.desktop
-# /usr/share/services/amarok_aKode-engine.desktop
-# - aKode engine?
+#
+# TODO:
+# * postgresql support alongside mysql
+# * NMM audio backend support (fix build - propably some BRs)
+# * make descriptions less useless
+# * HelixPlayer engine (fix build - propably some BRs)
#
# Conditional builds:
%bcond_without arts # disable arts engine
%bcond_without gstreamer # disable gstreamer
+%bcond_without mas # disable MAS audio backend
%bcond_without xine # disable xine engine
%bcond_without xmms # disable xmms wrapping
-%bcond_with mysql # enable mysql support
-%bcond_with akode # enable aKode engine (too buggy/incomplete)
-#
+%bcond_without zeroconf # disable suport for zeroconf
+%bcond_with helix # enable HelixPlayer engine
+%bcond_with nmm # enable NMM audio backend
+%bcond_with mysql # enable mysql support
+%bcond_with akode # enable aKode engine (too buggy/incomplete)
Summary: A KDE audio player
Summary(pl): Odtwarzacz audio dla KDE
Name: amarok
-Version: 1.2.4
+Version: 1.3
Release: 1
License: GPL
Group: X11/Applications/Multimedia
-Source0: http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
-# Source0-md5: 9a3bb2c043d1db169c6a370aff439e0f
+Source0: http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2
+# Source0-md5: 2dd100584795fb20c621fdbc96cbee1e
+Patch0: kde-common-gcc4.patch
URL: http://amarok.kde.org/
BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel
@@ -32,15 +34,16 @@
BuildRequires: automake
%{?with_gstreamer:BuildRequires: gstreamer-plugins-devel >= 0.8.1}
BuildRequires: kdebase-devel
-BuildRequires: kdemultimedia-akode
+%{?with_akode:BuildRequires: kdemultimedia-akode}
BuildRequires: kdemultimedia-devel >= 9:3.1.93
+BuildRequires: libltdl-devel
BuildRequires: libmusicbrainz-devel
BuildRequires: libvisual-devel >= 0.2.0
BuildRequires: pcre-devel
BuildRequires: rpmbuild(macros) >= 1.129
BuildRequires: sed >= 4.0
BuildRequires: sqlite3-devel
-BuildRequires: taglib-devel >= 1.3.1
+BuildRequires: taglib-devel >= 1.4
#BuildRequires: unsermake >= 040511
%{?with_xine:BuildRequires: xine-lib-devel >= 2:1.0-0.rc5.0}
%{?with_xmms:BuildRequires: xmms-devel}
@@ -61,7 +64,7 @@
Summary: Plugin arts
Summary(pl): Wtyczka arts
Group: X11/Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+PreReq: %{name} = %{version}-%{release}
Provides: %{name}-plugin = %{version}-%{release}
%description arts
@@ -70,6 +73,19 @@
%description arts -l pl
Wtyczka arts.
+%package akode
+Summary: Plugin akode
+Summary(pl): Wtyczka akode
+Group: X11/Applications/Multimedia
+PreReq: %{name} = %{version}-%{release}
+Provides: %{name}-plugin = %{version}-%{release}
+
+%description akode
+Plugin akode.
+
+%description akode -l pl
+Wtyczka akode.
+
%package gstreamer
Summary: Plugin gstreamer
Summary(pl): Wtyczka gstreamer
@@ -112,9 +128,23 @@
%description xine -l pl
Wtyczka xine.
+%package zeroconf
+Summary: Zeroconf data
+Summary(pl): Dane dla zeroconf
+Group: X11/Applications/Multimedia
+PreReq: %{name} = %{version}-%{release}
+Requires: kdenetwork-kdnssd
+Provides: %{name}-plugin = %{version}-%{release}
+
+%description zeroconf
+Zeroconf data.
+
+%description zeroconf -l pl
+Zeroconf data.
+
%prep
%setup -q
-
+%patch0 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
amarok/src/amarok.desktop \
@@ -128,8 +158,12 @@
%configure \
--disable-rpath \
%{!?with_arts:--without-arts} \
+ %{?with_mas:--with-mas} \
%{!?with_xine:--without-xine} \
%{!?with_gstreamer:--without-gstreamer} \
+ %{!?with_akode:--without-akode} \
+ %{?with_helix:--with-helix} \
+ %{?with_nmm:--with-nmm} \
%{?with_mysql:--with-mysql} \
--disable-final \
--with-qt-libraries=%{_libdir} \
@@ -172,6 +206,8 @@
%{_datadir}/apps/amarok
%{_datadir}/apps/konqueror/servicemenus/amarok_append.desktop
%{_datadir}/apps/konqsidebartng/add/amarok.desktop
+%{_datadir}/apps/konqsidebartng/entries/amarok.desktop
+%{_datadir}/apps/konqsidebartng/kicker_entries/amarok.desktop
%{_datadir}/apps/profiles/amarok.profile.xml
%{_datadir}/config/amarokrc
%{_datadir}/config.kcfg/amarok.kcfg
@@ -193,6 +229,14 @@
%{_datadir}/services/amarok_artsengine_plugin.desktop
%endif
+%if %{with akode}
+%files akode
+%defattr(644,root,root,755)
+%{_libdir}/kde3/libamarok_aKode-engine.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_aKode-engine.so
+%{_datadir}/services/amarok_aKode-engine.desktop
+%endif
+
%if %{with gstreamer}
%files gstreamer
%defattr(644,root,root,755)
@@ -207,16 +251,26 @@
%defattr(644,root,root,755)
%{_libdir}/kde3/libamarok_xine-engine.la
%attr(755,root,root) %{_libdir}/kde3/libamarok_xine-engine.so
+%{_datadir}/config.kcfg/xinecfg.kcfg
%{_datadir}/services/amarok_xine-engine.desktop
#%{_datadir}/services/amarok_xineengine_plugin.desktop
%endif
+%if %{with zeroconf}
+%files zeroconf
+%defattr(644,root,root,755)
+%{_datadir}/apps/zeroconf/_shoutcast._tcp
+%endif
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.55 2005/08/15 16:14:06 arekm
+- merged from DEVEL
+
Revision 1.54 2005/07/01 00:20:09 glen
- update akode bcond description from changelog
@@ -325,6 +379,195 @@
Revision 1.35.2.1 2004/11/27 11:35:31 paszczus
- updated to 1.2-beta1
- release 0.1; test build please
+
+Revision 1.36 2004/11/27 11:32:55 paszczus
+- updated to 1.2-beta1
+
+Revision 1.35.2.42 2005/08/15 15:31:26 paszczus
+- added --with-nmm to configure
+
+Revision 1.35.2.41 2005/08/15 15:08:05 paszczus
+- s/helixplayer/helix/g in bcond
+
+Revision 1.35.2.40 2005/08/15 11:02:58 paszczus
+- spaces -> tabs
+
+Revision 1.35.2.39 2005/08/15 11:00:34 paszczus
+- updated to 1.3
+- release 1 ; ready to merge to HEAD
+
+Revision 1.35.2.38 2005/08/11 06:27:26 paszczus
+- updated TODO
+
+Revision 1.35.2.37 2005/08/10 12:21:50 glen
+- fix with mas bcond on configure
+
+Revision 1.35.2.36 2005/08/10 12:21:11 glen
+- add xinecfg.kcfg to xine package
+
+Revision 1.35.2.35 2005/08/10 11:07:17 paszczus
+- added MAS support be default
+- added helixplayer and nnm bcond off by default (not build)
+
+Revision 1.35.2.34 2005/08/10 10:10:03 paszczus
+- little cleanup
+
+Revision 1.35.2.33 2005/08/09 21:24:10 glen
+- FUCK!. merge akode bcond from HEAD
+
+Revision 1.35.2.32 2005/08/09 17:01:41 paszczus
+- commented out akode support:
+SVN commit 423723 by markey:
+Disable akode engine. It (the engine) and/or akode is buggy and only implements a small subset
+of our features. We're getting tons of bug reports for it. So that's it.
+
+Revision 1.35.2.31 2005/08/09 14:32:04 paszczus
+- updated to 1.3beta3
+- removed BR: rpm-pythonprov
+- updated BR: taglib-devel >= 1.4
+
+Revision 1.35.2.30 2005/07/24 01:42:41 glen
+- lang files back (why these were disabled?)
+
+Revision 1.35.2.29 2005/07/24 01:20:58 glen
+- subpackages PreReq main package to prevent dependency loop detected by poldek
+
+Revision 1.35.2.28 2005/07/03 20:13:04 glen
+- more todo
+
+Revision 1.35.2.27 2005/07/03 20:09:02 glen
+- BR: rpm-pythonprov because of:
+error: Couldn't exec /usr/lib/rpm/pythondeps.sh: No such file or directory
+getOutputFrom(): Broken pipe
+Error: package build failed. (no more info)
+
+Revision 1.35.2.26 2005/07/03 14:06:57 glen
+- there's some HelixPlayer engine since beta1
+
+Revision 1.35.2.25 2005/06/29 20:57:23 averne
+- up to 1.3beta2
+
+Revision 1.35.2.24 2005/06/27 13:55:54 paszczus
+- updated to 1.3beta2
+
+Revision 1.35.2.23 2005/06/12 22:20:37 paszczus
+- added BR: libltdl-devel
+
+Revision 1.35.2.22 2005/06/06 18:34:21 paszczus
+- fixed %doc
+
+Revision 1.35.2.21 2005/06/06 14:55:56 paszczus
+- updated to 1.3-beta1
+- cleanups
+
+Revision 1.35.2.20 2005/05/25 13:47:00 djurban
+- also note that i added zeroconf data package to amarok in the last commit
+
+Revision 1.35.2.19 2005/05/25 13:46:17 djurban
+- updated to 050525
+- the biggest new feature is: http://amarok.kde.org/blog/uploads/browser1.png
+ a total rewrite of smart playlists, now they are ultracool :)
+
+Revision 1.35.2.18 2005/05/03 17:33:18 djurban
+- update to 050503 snap
+- new todo (add more engines and postgresql support)
+
+Revision 1.50 2005/04/30 11:32:40 glen
+- comment about gstreamer dep
+
+Revision 1.49 2005/04/30 10:44:13 glen
+- add R: gstreamer-audio-effects on -gstreamer
+
+Revision 1.48 2005/04/02 13:43:08 darekr
+- unified
+
+Revision 1.47 2005/03/31 21:36:48 paszczus
+- updated t o 1.2.3
+
+Revision 1.46 2005/03/25 22:55:20 zawadaa
+- up to 1.2.2
+
+Revision 1.45 2005/03/25 18:24:22 darekr
+- typo in BRs
+
+Revision 1.44 2005/03/14 14:06:13 havner
+- rel up for new flac
+
+Revision 1.43 2005/03/08 14:48:41 wolf
+- BR kdemultimedia-akode
+
+Revision 1.42 2005/03/02 06:51:16 paszczus
+- added BR: SDL-devel (pointed out by Tomasz Kowalczyk
+
+Revision 1.41 2005/03/01 22:36:00 paszczus
+- commented one file ; should build now
+
+Revision 1.40 2005/03/01 22:14:24 paszczus
+- updated to 1.2.1
+
+Revision 1.39 2005/02/14 23:09:47 paszczus
+- updated to FINAL 1.2 (merged from DEVEL)
+- STBR
+
+Revision 1.35.2.17 2005/02/13 19:47:54 paszczus
+- updated to FINAL 1.2
+- STBR
+
+Revision 1.35.2.16 2005/02/02 22:46:46 adgor
+- Missing files
+- TODO: separate konqueror part
+- Still sucks
+
+Revision 1.35.2.15 2005/02/02 20:52:13 adgor
+- No unsermake
+
+Revision 1.35.2.14 2005/02/01 21:22:54 paszczus
+- updated to 1.2.beta4
+
+Revision 1.35.2.13 2005/01/17 10:20:14 paszczus
+- removed R: libvisual-plugins
+- added info about libvisual-plugins-* in %post
+- visualizations in amarok now works fine (with libvisual-plugins at DEVEL)
+
+Revision 1.35.2.12 2005/01/17 09:41:51 paszczus
+- added R: libvisual-plugins
+
+Revision 1.35.2.11 2005/01/09 23:25:58 paszczus
+- added R: kdemultimedia-audiocd (for support AudioCD in amarok)
+
+Revision 1.35.2.10 2005/01/09 14:39:45 paszczus
+- updated to 1.2beta3
+- updated BR: taglib >= 1.3.1
+- changed BR: s/gstreamer-devel/gstreamer-plugins-devel/
+- added 2 files to %files
+
+Revision 1.35.2.9 2004/12/31 14:27:01 paszczus
+- added BR: kdebase-devel ; now it builds
+
+Revision 1.35.2.8 2004/12/10 14:20:11 paszczus
+- updated to 1.2-beta2
+
+Revision 1.35.2.7 2004/11/29 06:48:00 domelu
+- remove duplucated BR: mysql-devel
+
+Revision 1.35.2.6 2004/11/28 20:27:01 averne
+- oooops, sorry
+
+Revision 1.35.2.5 2004/11/28 18:40:50 averne
+- added MySql support
+
+Revision 1.35.2.4 2004/11/28 12:15:16 paszczus
+- BR: libvisual-devel >= 0.2.0 ; amarok_libvisual is back in %files
+
+Revision 1.35.2.3 2004/11/28 10:47:37 paszczus
+- commented out amarok_libvisual from %files, but not sure of this...
+
+Revision 1.35.2.2 2004/11/27 12:23:53 paszczus
+- amarok now support mysql, so BR: mysql-devel (thx domelu)
+
+Revision 1.35.2.1 2004/11/27 11:35:31 paszczus
+- updated to 1.2-beta1
+- release 0.1 ; test build please
Revision 1.36 2004/11/27 11:32:55 paszczus
- updated to 1.2-beta1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.54&r2=1.55&f=u
More information about the pld-cvs-commit
mailing list