Author: glen Date: Tue Aug 9 21:24:16 2005 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- FUCK!. merge akode bcond from HEAD
---- Files affected:
SPECS:
amarok.spec (1.35.2.32 -> 1.35.2.33)
---- Diffs:
================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.35.2.32 SPECS/amarok.spec:1.35.2.33
--- SPECS/amarok.spec:1.35.2.32 Tue Aug 9 19:01:41 2005
+++ SPECS/amarok.spec Tue Aug 9 23:24:10 2005
@@ -11,8 +11,9 @@
%bcond_without gstreamer # disable gstreamer
%bcond_without xine # disable xine engine
%bcond_without xmms # disable xmms wrapping
-%bcond_without zeroconf # disbale suport for zeroconf
+%bcond_without zeroconf # disable suport for zeroconf
%bcond_with mysql # enable mysql support
+%bcond_with akode # enable aKode engine (too
buggy/incomplete)
#
%define _beta beta3
Summary: A KDE audio player
@@ -32,7 +33,7 @@
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
@@ -71,20 +72,18 @@
%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}
-#%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.
+%description akode
+Plugin akode.
+%description akode -l pl
+Wtyczka akode.
%package gstreamer
Summary: Plugin gstreamer
@@ -131,7 +130,6 @@
%description zeroconf -l pl
Zeroconf data.
-
%prep
%setup -q -n %{name}-%{version}-%{_beta}
%patch0 -p1
@@ -150,6 +148,7 @@
%{!?with_arts:--without-arts} \
%{!?with_xine:--without-xine} \
%{!?with_gstreamer:--without-gstreamer} \
+ %{!?with_akode:--without-akode} \
%{?with_mysql:--with-mysql} \
--disable-final \
--with-qt-libraries=%{_libdir} \
@@ -215,11 +214,13 @@
%{_datadir}/services/amarok_artsengine_plugin.desktop
%endif
-#%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
+%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
@@ -251,6 +252,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.35.2.32&r2=1.35.2.33&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
