Rebase to upstream 1.2.0 release (rhbz#1060417)

- Drop no longer used ao.req Provides filter
This commit is contained in:
Hans de Goede 2014-02-23 23:54:52 +01:00
parent e291905445
commit 0b96e6c84e
5 changed files with 9 additions and 26 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
libao-0.8.8.tar.gz
/libao-1.0.0.tar.gz
/libao-1.1.0.tar.gz
/libao-1.2.0.tar.gz

7
ao.req
View File

@ -1,7 +0,0 @@
#!/bin/sh
filelist=`sed "s/['\"]/\\\&/g"`
{ echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires | \
grep -v 'artsc\|esd\|audiofile\|asound\|libpulse'
} | sort -u

View File

@ -1,14 +0,0 @@
diff -up libao-1.0.0/src/audio_out.c~ libao-1.0.0/src/audio_out.c
--- libao-1.0.0/src/audio_out.c~ 2010-03-24 05:11:42.000000000 +0100
+++ libao-1.0.0/src/audio_out.c 2010-11-05 10:38:29.098337997 +0100
@@ -189,7 +189,9 @@ static driver_list *_get_plugin(char *pl
} else {
- aerror("Failed to load plugin %s => dlopen() failed\n",plugin_file);
+ /* HDG: Silence plugin load errors when the needed libs are not
+ installed */
+ /* aerror("Failed to load plugin %s => dlopen() failed\n",plugin_file); */
return NULL;
}

View File

@ -1,12 +1,11 @@
Name: libao
Version: 1.1.0
Release: 8%{?dist}
Version: 1.2.0
Release: 1%{?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
BuildRequires: alsa-lib-devel
BuildRequires: pkgconfig(libpulse)
@ -19,7 +18,6 @@ ESD, OSS, Solaris, and IRIX.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
The %{name}-devel package contains libraries and header files for
@ -59,12 +57,17 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
%files devel
%doc doc/*.html doc/*.c doc/*.css
%{_includedir}/ao
%{_libdir}/ckport
%{_libdir}/libao.so
%{_libdir}/pkgconfig/ao.pc
%{_datadir}/aclocal/ao.m4
%changelog
* Sun Feb 23 2014 Hans de Goede <hdegoede@redhat.com> - 1.2.0-1
- Rebase to upstream 1.2.0 release (rhbz#1060417)
- Drop no longer used ao.req Provides filter
* Mon Aug 05 2013 Hans de Goede <hdegoede@redhat.com> - 1.1.0-8
- Fix FTBFS caused by unversioned docdir change (#992054)

View File

@ -1 +1 @@
2b2508c29bc97e4dc218fa162cf883c8 libao-1.1.0.tar.gz
9f5dd20d7e95fd0dd72df5353829f097 libao-1.2.0.tar.gz