- FUCK!. merge akode bcond from HEAD

Changed files:
    amarok.spec -> 1.35.2.33

diff --git a/amarok.spec b/amarok.spec
index 2a7c9b54e09dd32fd0402e09c5a59a373c781040..1139ad12e9e923856e484e693f7c9c20be733784 100644 (file)
--- a/amarok.spec
+++ b/amarok.spec
@@ -10,8 +10,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
@@ -31,7 +32,7 @@ BuildRequires:        arts-qt-devel
 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
@@ -70,20 +71,18 @@ Plugin arts.
 %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
@@ -130,7 +129,6 @@ Zeroconf data.
 %description zeroconf -l pl
 Zeroconf data.
 
-
 %prep
 %setup -q -n %{name}-%{version}-%{_beta}
 %patch0 -p1
@@ -149,6 +147,7 @@ cp -f /usr/share/automake/config.sub admin
        %{!?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} \
@@ -214,11 +213,13 @@ echo "want to have a visualizations in amarok."
 %{_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