packages: mpg123/mpg123.spec - unify pulseaudio bcond

[glen]

Author: glen                         Date: Tue Jul 13 14:44:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify pulseaudio bcond

---- Files affected:
packages/mpg123:
   mpg123.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: packages/mpg123/mpg123.spec
diff -u packages/mpg123/mpg123.spec:1.105 packages/mpg123/mpg123.spec:1.106
--- packages/mpg123/mpg123.spec:1.105	Thu Jun  3 13:17:55 2010
+++ packages/mpg123/mpg123.spec	Tue Jul 13 16:44:52 2010
@@ -10,8 +10,8 @@
 %bcond_without	openal	# disable openal support
 %bcond_without	sdl	# disable sdl support
 %bcond_without	port	# disable portaudio support
-%bcond_without	pulse	# disable pulseaudio support
-#
+%bcond_without	pulseaudio	# disable pulseaudio support
+
 %ifarch pentium3 pentium4 athlon
 %define		with_mmx	1
 %endif
@@ -43,9 +43,9 @@
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 2:1.5
 %{?with_nas:BuildRequires:	nas-devel}
-%{?with_port:BuildRequires:	portaudio-devel >= 18}
-%{?with_pulse:BuildRequires:	pulseaudio-devel}
 BuildRequires:	pkgconfig
+%{?with_port:BuildRequires:	portaudio-devel >= 18}
+%{?with_pulseaudio:BuildRequires:	pulseaudio-devel}
 Requires:	libmpg123 = %{version}-%{release}
 Suggests:	%{name}-alsa = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -321,7 +321,7 @@
 %attr(755,root,root) %{_libdir}/mpg123/output_portaudio.so
 %endif
 
-%if %{with pulse}
+%if %{with pulseaudio}
 %files pulseaudio
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/mpg123/output_pulse.so
@@ -356,6 +356,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2010/07/13 14:44:52  glen
+- unify pulseaudio bcond
+
 Revision 1.105  2010/06/03 11:17:55  baggins
 - rel 3
 - esound is dead
@@ -612,7 +615,7 @@
 - release 7: use new %doc.
 
 Revision 1.33  2002/04/05 15:26:38  roman
-s/Freely/freely in License
+- s/Freely/freely in License
 
 Revision 1.32  2002/02/23 03:54:21  kloczek
 - adapterized.
@@ -628,7 +631,7 @@
 - use ix86 macros
 
 Revision 1.28  2002/01/18 02:13:58  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.27  2001/12/07 11:56:42  kloczek
 - add to makefile patch handle linux-sparc-esd target,
@@ -652,10 +655,10 @@
 - release 4
 
 Revision 1.21  2001/05/02 21:51:24  qboosh
-- adapterized and made spec %%debug ready or added using %%rpm*flags macros
+- adapterized and made spec %debug ready or added using %rpm*flags macros
 
 Revision 1.20  2000/06/09 07:23:26  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.19  2000/06/07 03:33:09  kloczek
 - spec adapterized.
@@ -687,10 +690,3 @@
 
 Revision 1.11  1999/07/12 23:06:10  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Fri May 21 1999 Piotr Czerwiński <pius at pld.org.pl>
-  [0.59q-1]
-- package is FHS 2.0 compliant,
-- based on spec file written by Karsten Weiss <karsten at addx.au.s.shuttle.de>,
-  modified for PLD use by me and Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>,
-- pl translation by Marek Obuchowicz <elephant at shadow.eu.org>.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpg123/mpg123.spec?r1=1.105&r2=1.106&f=u