[xiph-cvs] r6484 - trunk/ao

[volsung at xiph.org]

Author: volsung
Date: 2004-04-01 22:50:12 -0500 (Thu, 01 Apr 2004)
New Revision: 6484

Modified:
   trunk/ao/libao.spec
Log:
RPM spec updates from Gary Peck.

<p>Modified: trunk/ao/libao.spec
===================================================================
--- trunk/ao/libao.spec	2004-04-01 06:17:38 UTC (rev 6483)
+++ trunk/ao/libao.spec	2004-04-02 03:50:12 UTC (rev 6484)
@@ -1,19 +1,20 @@
 Name:		libao
 Version:	0.8.5
-Release:	1
+Release:	3
 Summary:	Cross-Platform Audio Output Library
 
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://www.xiph.org/
 Vendor:		Xiph.org Foundation <team at xiph.org>
-Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
+Source:		http://www.xiph.org/ao/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 # glibc-devel is needed for oss plug-in build
 BuildRequires:  glibc-devel
-BuildRequires: 	esound-devel >= 0.2.8
-BuildRequires: 	arts-devel
+%{!?_without_esd:BuildRequires: esound-devel >= 0.2.8}
+%{!?_without_arts:BuildRequires: arts-devel}
+%{?_with_alsa:BuildRequires: alsa-lib-devel >= 0.9.0}
 # FIXME: perl is needed for the dirty configure flag trick, which should be
 # solved differently
 BuildRequires:  perl
@@ -26,6 +27,10 @@
 need to install the supporting libraries for any plug-ins you want to use
 in order for them to work.
 
+Available rpmbuild rebuild options :
+--with : alsa
+--without : esd arts
+
 %package devel
 Summary: Cross Platform Audio Output Library Development
 Group: Development/Libraries
@@ -43,7 +48,12 @@
 
 %build
 
-%configure
+%configure \
+    --disable-nas \
+    --disable-alsa \
+    %{?_with_alsa:--enable-alsa09} %{!?_with_alsa:--disable-alsa09} \
+    %{?_without_esd:--disable-esd} \
+    %{?_without_arts:--disable-arts}
 
 make
 
@@ -68,20 +78,33 @@
 %doc AUTHORS CHANGES COPYING README
 %{_libdir}/libao.so.*
 %{_libdir}/ao/*/liboss.so
-%{_libdir}/ao/*/libesd.so
-%{_libdir}/ao/*/libarts.so
+%{!?_without_esd:%{_libdir}/ao/*/libesd.so}
+%{!?_without_arts:%{_libdir}/ao/*/libarts.so}
+%{?_with_alsa:%{_libdir}/ao/*/libalsa09.so}
 %{_mandir}/man5/*
 
 %files devel
+%defattr(-,root,root)
 %doc doc/*
 %{_includedir}/ao
 %{_libdir}/libao.so
 %{_libdir}/libao.la
-%{_libdir}/ao/*/*.la
+%{_libdir}/ao/*/liboss.la
+%{!?_without_esd:%{_libdir}/ao/*/libesd.la}
+%{!?_without_arts:%{_libdir}/ao/*/libarts.la}
+%{?_with_alsa:%{_libdir}/ao/*/libalsa09.la}
 %{_datadir}/aclocal/ao.m4
 %{_libdir}/pkgconfig/ao.pc
 
 %changelog
+* Mon Mar 25 2004 Gary Peck <gbpeck at sbcglobal.net> 0.8.5-3
+- Set default user and permissions on the devel package
+
+* Mon Mar 22 2004 Gary Peck <gbpeck at sbcglobal.net> 0.8.5-2
+- Update source URL
+- Add support for "--with alsa", "--without esd" and "--without arts"
+- Make configure more explicit on what plugins to enable
+
 * Fri Mar 11 2004 Stan Seibert <volsung at xiph.org> 0.8.5-1
 - Version bump
 

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.