From 4c5978d1ecc3da05cdfb4e09d90cf0383b49968d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 24 Oct 2006 17:05:10 +0000
Subject: [PATCH] 1.2beta1

---
 .cvsignore |  3 +--
 sources    |  2 +-
 speex.spec | 14 ++++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 60cfa37..7228474 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-speex-1.0.4.tar.gz
-speex-1.0.5.tar.gz
+speex-1.2beta1.tar.gz
diff --git a/sources b/sources
index 02356ab..17541c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01d6a2de0a88a861304bf517615dea79  speex-1.0.5.tar.gz
+aac2e4ba42122b885c787ea280acb3d9  speex-1.2beta1.tar.gz
diff --git a/speex.spec b/speex.spec
index e1c79da..8a698aa 100644
--- a/speex.spec
+++ b/speex.spec
@@ -9,6 +9,10 @@ Source0: 	http://www.speex.org/download/%{name}-1.2beta1.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libogg-devel
 
+# don't build unneded test programs, since they seem to cause
+# build failures
+Patch0: speex-1.2beta1-test-progs.patch
+
 %description
 Speex is a patent-free compression format designed especially for
 speech. It is specialized for voice communications at low bit-rates in
@@ -20,6 +24,7 @@ data (e.g. voice mail).
 Summary: 	Development package for %{name}
 Group: 		Development/Libraries
 Requires: 	%{name} = %{version}-%{release}
+Requires: 	pkgconfig
 
 %description devel
 Speex is a patent-free compression format designed especially for
@@ -27,6 +32,7 @@ speech. This package contains development files for %{name}
 
 %prep
 %setup -q -n speex-1.2beta1
+%patch0 -p1 -b .test-progs
 
 %build
 %configure --enable-static --with-ogg-libraries=%{_libdir}
@@ -56,12 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %exclude %{_libdir}/libspeex.la
-%{_includedir}/speex/
-%{_includedir}/speex.h
-%{_includedir}/speex_bits.h
-%{_includedir}/speex_callbacks.h
-%{_includedir}/speex_header.h
-%{_includedir}/speex_stereo.h
+%{_includedir}/speex
 %{_datadir}/aclocal/speex.m4
 %{_libdir}/pkgconfig/speex.pc
 %{_libdir}/libspeex.so
@@ -70,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Oct 24 2006 Matthias Clasen <mclasen@redhat.com> - 1.2-0.1.beta1
 - Update to 1.2beta1
+- Require pkgconfig in the -devel package
 
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.0.5-2.1
 - rebuild