rpms/akode/F-8 akode.spec,1.14,1.15

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	akode.spec 
Log Message:
* Mon Jan 07 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-4
- -Requires: %name-pulseaudio (can be added to kde-settings-pulseaudio)



Index: akode.spec
===================================================================
RCS file: /cvs/pkgs/rpms/akode/F-8/akode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- akode.spec	24 Dec 2007 04:40:15 -0000	1.14
+++ akode.spec	9 Jan 2008 04:48:45 -0000	1.15
@@ -2,7 +2,7 @@
 Summary: Audio-decoding framework 
 Name:	 akode 
 Version: 2.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -18,19 +18,15 @@
 %define _with_flac --with-flac
 %if 0%{?fedora} > 4
 %define _with_jack --with-jack
+%define _with_libsamplerate --with-libsamplerate
 %define _with_pulseaudio --with-pulseaudio
 %endif
 
-%if 0%{?fedora} > 7
-# pulseaudio is/will-be the F8 default
-Requires: %{name}-pulseaudio
-%endif
-
 BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
 %{?_with_flac:BuildRequires: flac-devel}
 %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
-BuildRequires: libsamplerate-devel
+%{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
 BuildRequires: libvorbis-devel
 %{?_with_pulseaudio:BuildRequires: pulseaudio-lib-devel}
 BuildRequires: speex-devel
@@ -100,7 +96,7 @@
   --without-oss \
   %{?_with_flac} %{!?_with_flac:--without-flac} \
   %{?_with_jack} %{!?_with_jack:--without-jack} \
-  --with-libsamplerate \
+  %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
   %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
   --with-speex \
   --with-vorbis \
@@ -156,19 +152,24 @@
 %{_libdir}/libakode_jack_sink.so
 %endif
 
+# License: GPLv2+
+%if "%{?_with_libsamplerate:1}" == "1"
+%files libsamplerate
+%defattr(-,root,root,-)
+%{_libdir}/libakode_src_resampler.so
+%endif
+
 %if "%{?_with_pulseaudio:1}" == "1"
 %files pulseaudio
 %defattr(-,root,root,-)
 %{_libdir}/libakode_polyp_sink.so
 %endif
 
-# License: GPLv2+
-%files libsamplerate
-%defattr(-,root,root,-)
-%{_libdir}/libakode_src_resampler.so
-
 
 %changelog
+* Mon Jan 07 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-4
+- -Requires: %%name-pulseaudio (can be added to kde-settings-pulseaudio)
+
 * Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-3
 - fix flac113 support