SPECS: cdrdao.spec - mp3 bcond splitted to mp3/ogg, BRs.

[pluto]

Author: pluto                        Date: Mon Sep 19 22:32:22 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- mp3 bcond splitted to mp3/ogg, BRs.

---- Files affected:
SPECS:
   cdrdao.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/cdrdao.spec
diff -u SPECS/cdrdao.spec:1.60 SPECS/cdrdao.spec:1.61
--- SPECS/cdrdao.spec:1.60	Tue Sep 20 00:24:52 2005
+++ SPECS/cdrdao.spec	Tue Sep 20 00:32:17 2005
@@ -2,7 +2,8 @@
 #
 # Conditional build:
 %bcond_with	gnome	# build gcdmaster
-%bcond_without	mp3	# without MP3 and Ogg support
+%bcond_without	mp3	# without MP3 support
+%bcond_without	ogg	# without Ogg support
 #
 Summary:	Tools for burning CDRs in Disk At Once mode
 Summary(pl):	Narzędzia do wypalania płyt w trybie Disk At Once
@@ -25,13 +26,17 @@
 BuildRequires:	automake
 BuildRequires:	cdrtools-devel >= 3:2.01a25
 %{?with_gnome:BuildRequires:	gtkmm-devel >= 2.4.0}
+%{?with_mp3:BuildRequires:	lame-libs-devel >= 3.92}
+%if %{with mp3} || %{with ogg}
 BuildRequires:	lame-libs-devel >= 3.92
 BuildRequires:	libao-devel >= 0.8
+%endif
+%{?with_mp3:BuildRequires:	libmad-devel >= 0.15.1b-4}
 %{?with_gnome:BuildRequires:	libgnomeuimm-devel >= 2.6.0}
 BuildRequires:	libmad-devel >= 0.15.1b-4
 %{?with_gnome:BuildRequires:	libsigc++-devel >= 2.0.0}
 BuildRequires:	libstdc++-devel
-BuildRequires:	libvorbis-devel >= 1.0
+%{?with_ogg:BuildRequires:	libvorbis-devel >= 1.0}
 BuildRequires:	pccts >= 1.33MR33-8
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -91,18 +96,12 @@
 PKG_CONFIG=%{_bindir}/pkg-config \
 %configure \
 	--with-pcctsbin=%{_bindir} \
-	--with-pcctsinc=/usr/lib/pccts/h \
-	--with-scglib-inc=/usr/include/schily \
-	%if %{with gnome}
-	--with-xdao \ 
-	%else
-	--without-xdao \
-	%endif
-	%if %{without mp3}
-	--without-ogg-support \
-	--without-mp3-support \
-	%endif 
-	--with-scglib-lib=/usr/lib 
+	--with-pcctsinc=%{_libdir}/pccts/h \
+	--with-scglib-inc=%{_includedir}/schily \
+	--with-scglib-lib=%{_libdir} \
+	--with%{!?with_gnome:out}-xdao \
+	--with%{!?with_mp3:out}-mp3-support \
+	--with%{!?with_ogg:out}-ogg-support
 
 %{__make}
 
@@ -145,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2005/09/19 22:32:17  pluto
+- mp3 bcond splitted to mp3/ogg, BRs.
+
 Revision 1.60  2005/09/19 22:24:52  qboosh
 - updated xdao BRs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cdrdao.spec?r1=1.60&r2=1.61&f=u