From 61e2db34abe1575a2b25290311238a5c0993b956 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Thu, 15 Nov 2007 13:45:08 +0000
Subject: [PATCH] - Minor packaging cleanups for merge review (bz 225986)

---
 ao.req     | 3 +--
 libao.spec | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ao.req b/ao.req
index f1c9219..b340808 100755
--- a/ao.req
+++ b/ao.req
@@ -3,6 +3,5 @@
 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 libpulse
+	grep -v 'artsc\|esd\|audiofile\|asound\|libpulse'
 } | sort -u
diff --git a/libao.spec b/libao.spec
index c1f8c28..3b8eb30 100644
--- a/libao.spec
+++ b/libao.spec
@@ -1,6 +1,6 @@
 Name:           libao
 Version:        0.8.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross Platform Audio Output Library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -51,7 +51,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 
 # remove unpackaged files from the buildroot
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
@@ -83,9 +83,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 15 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 0.8.8-3
+- Minor packaging cleanups for merge review (bz 225986)
+
 * Wed Nov 14 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 0.8.8-2
 - Fix multilib conflict (bz 341891)
-- Fix Source0 en URL urls
+- Fix Source0 and URL urls
 
 * Wed Nov  7 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.8-1
 - Updated to 0.8.8 (bz 316731)