From 0b96e6c84e8bfb2b68cd8d109187c828b21fc3b6 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 23 Feb 2014 23:54:52 +0100
Subject: [PATCH] Rebase to upstream 1.2.0 release (rhbz#1060417)

- Drop no longer used ao.req Provides filter
---
 .gitignore                               |  1 +
 ao.req                                   |  7 -------
 libao-1.0.0-silence-plugin-loading.patch | 14 --------------
 libao.spec                               | 11 +++++++----
 sources                                  |  2 +-
 5 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100755 ao.req
 delete mode 100644 libao-1.0.0-silence-plugin-loading.patch

diff --git a/.gitignore b/.gitignore
index 34e6ce2..cd12630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/ao.req b/ao.req
deleted file mode 100755
index b340808..0000000
--- a/ao.req
+++ /dev/null
@@ -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
diff --git a/libao-1.0.0-silence-plugin-loading.patch b/libao-1.0.0-silence-plugin-loading.patch
deleted file mode 100644
index 84d75fe..0000000
--- a/libao-1.0.0-silence-plugin-loading.patch
+++ /dev/null
@@ -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;
- 	}
- 
diff --git a/libao.spec b/libao.spec
index 98ddf32..52017d7 100644
--- a/libao.spec
+++ b/libao.spec
@@ -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)
 
diff --git a/sources b/sources
index 4c0b9dd..3e82793 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b2508c29bc97e4dc218fa162cf883c8  libao-1.1.0.tar.gz
+9f5dd20d7e95fd0dd72df5353829f097  libao-1.2.0.tar.gz