rpms/libao/devel .cvsignore, 1.8, 1.9 ao.req, 1.2, 1.3 libao.spec, 1.25, 1.26 sources, 1.8, 1.9

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/libao/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3023

Modified Files:
	.cvsignore ao.req libao.spec sources 
Log Message:
* Wed Nov 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.8.8-2
- Fix multilib conflict (bz 341891)
- Fix Source0 en URL urls



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libao/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Nov 2005 20:34:08 -0000	1.8
+++ .cvsignore	14 Nov 2007 14:14:39 -0000	1.9
@@ -1,2 +1 @@
-libao-0.8.5.tar.gz
-libao-0.8.6.tar.gz
+libao-0.8.8.tar.gz


Index: ao.req
===================================================================
RCS file: /cvs/extras/rpms/libao/devel/ao.req,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ao.req	9 Sep 2004 07:19:42 -0000	1.2
+++ ao.req	14 Nov 2007 14:14:39 -0000	1.3
@@ -3,5 +3,6 @@
 filelist=`sed "s/['\"]/\\\&/g"`
 
 { echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires | \
-	grep -v artsc | grep -v esd | grep -v audiofile | grep -v asound
+	grep -v artsc | grep -v esd | grep -v audiofile | grep -v asound | \
+	grep -v libpulse
 } | sort -u


Index: libao.spec
===================================================================
RCS file: /cvs/extras/rpms/libao/devel/libao.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libao.spec	23 Aug 2007 17:21:56 -0000	1.25
+++ libao.spec	14 Nov 2007 14:14:39 -0000	1.26
@@ -1,14 +1,17 @@
-Summary: Cross Platform Audio Output Library.
-Name: libao
-Version: 0.8.6
-Release: 5%{?dist}
-Group: System Environment/Libraries
-License: GPL
-URL: http://www.xiph.org/
-Source:	http://www.xiph.org/ogg/vorbis/download/libao-%{version}.tar.gz
-Source1: ao.req
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: esound-devel >= 0.2.8, arts-devel, alsa-lib-devel
+Name:           libao
+Version:        0.8.8
+Release:        2%{?dist}
+Summary:        Cross Platform Audio Output Library
+Group:          System Environment/Libraries
+License:        GPLv2+
+URL:            http://xiph.org/ao/
+Source0:        http://downloads.xiph.org/releases/ao/%{name}-%{version}.tar.gz
+Source1:        ao.req
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  esound-devel >= 0.2.8
+BuildRequires:  arts-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  pulseaudio-lib-devel
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE1}
 
@@ -16,28 +19,35 @@
 Libao is a cross platform audio output library. It currently supports
 ESD, OSS, Solaris, and IRIX.
 
-%package devel
-Summary: Cross Platform Audio Output Library Development.
-Group: Development/Libraries
-Requires: libao = %{version}-%{release}
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 # needed because of disabled internal dependency generator.  sheesh
-Requires: %{_libdir}/libao.so.2
+Requires:       %{_libdir}/libao.so.2
 
 %description devel
-The libao-devel package contains the header files and documentation
-needed to develop applications with libao.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
 
 %prep
 %setup -q
 
-perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
-perl -p -i -e "s/-ffast-math//" configure
+sed -i "s/-O20/$RPM_OPT_FLAGS/" configure
+sed -i "s/-ffast-math//" configure
 # 216108
-perl -p -i -e "s/= -version-info/= -export-symbols-regex '^ao_.*' -version-info/" src/Makefile.in
+sed -i "s/= -version-info/= -export-symbols-regex '^ao_.*' -version-info/" src/Makefile.in
+
 
 %build
-%configure --enable-alsa09
-make
+%configure
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -46,29 +56,45 @@
 # remove unpackaged files from the buildroot
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 
+
+%clean 
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS CHANGES COPYING README
 %{_libdir}/libao.so.*
 %{_libdir}/ao
 %{_mandir}/man5/*
 
 %files devel
-%defattr(-,root,root)
-%doc doc/*
+%defattr(-,root,root,-)
+%doc doc/*.html doc/*.c doc/*.css
 %{_includedir}/ao
 %{_libdir}/libao.so
 %{_libdir}/pkgconfig/ao.pc
 %{_datadir}/aclocal/ao.m4
 
-%clean 
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 %changelog
+* Wed Nov 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 0.8.8-2
+- Fix multilib conflict (bz 341891)
+- Fix Source0 en URL urls
+
+* Wed Nov  7 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.8-1
+- Updated to 0.8.8 (bz 316731)
+- Cleaned up the SPEC
+- Added PulseAudio support
+- Made build parallel
+- Killed rpaths
+- Changed the kludges to use sed
+
 * Thu Aug 23 2007 Adam Jackson <ajax at redhat.com> - 0.8.6-5
 - Rebuild for build ID
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libao/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Nov 2005 20:34:13 -0000	1.8
+++ sources	14 Nov 2007 14:14:39 -0000	1.9
@@ -1 +1 @@
-12e136a4c0995068ff134997c84421ed  libao-0.8.6.tar.gz
+b92cba3cbcf1ee9bc221118a85d23dcd  libao-0.8.8.tar.gz