rpms/amarok/F-8 amarok.spec,1.96,1.97

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24867

Modified Files:
	amarok.spec 
Log Message:
* Fri May  2 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.9.1-3
- fix libnjb support (#444940)



Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-8/amarok.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- amarok.spec	17 Apr 2008 18:32:09 -0000	1.96
+++ amarok.spec	2 May 2008 12:59:26 -0000	1.97
@@ -24,13 +24,14 @@
 %define _with_libgpod --with-libgpod
 %define _with_libmtp --with-libmtp
 %define _with_libnjb --with-libnjb
+%define _with_libvisual --with-libvisual
 %define _with_mp4v2 --with-mp4v2
 %endif
 
 Name:       amarok
 Summary:    Media player
 Version:    1.4.9.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -62,14 +63,14 @@
 %{?_with_libmtp:BuildRequires:  libmtp-devel}
 BuildRequires:  libmusicbrainz-devel
 # Creative Nomad Jukebox
-%{?_with_njb:BuildRequires:  libnjb-devel}
+%{?_with_libnjb:BuildRequires:  libnjb-devel}
 BuildRequires:  libtool
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:  libtool-ltdl-devel
 %endif
 BuildRequires:  libtunepimp-devel
 BuildRequires:  libusb-devel
-BuildRequires:  libvisual-devel
+%{?_with_libvisual:BuildRequires:  libvisual-devel}
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  ruby-devel ruby
@@ -123,6 +124,7 @@
 %description konqueror
 %{summary}.
 
+%if 0%{?_with_libvisual:1}
 %package visualisation
 Summary:    Visualisation plugins for Amarok
 Group:      Applications/Multimedia
@@ -133,6 +135,7 @@
 Amarok can use visualisation plugins from different origins.
 Right now, only xmms is supported, which means that you can
 use any of xmms' visualisation plugins with Amarok.
+%endif
 
 
 %prep
@@ -155,6 +158,7 @@
      %{?_with_libgpod} %{!?_with_libgpod:--without-libgpod} \
      %{?_with_libmtp} %{!?_with_libmtp:--without-libmtp} \
      %{?_with_libnjb} %{!?_with_libnjb:--without-libnjb}  \
+     %{?_with_libvisual} %{!?_with_libvisual:--without-libvisual} \
      %{?_with_mp4v2} %{!?_with_mp4v2:--without-mp4v2}
 
 #     --enable-final \
@@ -256,7 +260,7 @@
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
 %endif
-%if 0%{?_with_njb:1}
+%if 0%{?_with_libnjb:1}
 # Creative Zen
 %{_datadir}/services/amarok_njb-mediadevice.desktop
 %{_libdir}/kde3/libamarok_njb-mediadevice.*
@@ -292,12 +296,20 @@
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
 %endif
 
+%if 0%{?_with_libvisual:1}
 %files visualisation
 %defattr(-,root,root,-)
 %{_bindir}/amarok_libvisual
+%endif
 
 
 %changelog
+* Fri May  2 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.9.1-3
+- fix libnjb support (#444940)
+
+* Thu May  1 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.9.1-2.1
+- --with-libvisual fedora-only (epel misses libvisual-plugins)
+
 * Thu Apr 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.4.9.1-2
 - specfile typo (unclosed macro)