rpms/speex/FC-6 sources,1.4,1.5 speex.spec,1.14,1.15

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/speex/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24584

Modified Files:
	sources speex.spec 
Log Message:
update to 1.2beta



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/speex/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Nov 2005 21:24:52 -0000	1.4
+++ sources	5 Nov 2006 20:26:50 -0000	1.5
@@ -1 +1 @@
-01d6a2de0a88a861304bf517615dea79  speex-1.0.5.tar.gz
+aac2e4ba42122b885c787ea280acb3d9  speex-1.2beta1.tar.gz


Index: speex.spec
===================================================================
RCS file: /cvs/dist/rpms/speex/FC-6/speex.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- speex.spec	12 Jul 2006 17:38:21 -0000	1.14
+++ speex.spec	5 Nov 2006 20:26:50 -0000	1.15
@@ -1,16 +1,17 @@
 Summary: 	A voice compression format (codec)
 Name: 		speex
-Version: 	1.0.5
-Release: 2.1
+Version: 	1.2
+Release:	0.1.beta1%{?dist}
 License: 	BSD
 Group: 		System Environment/Libraries
 URL: 		http://www.speex.org/
-Source0: 	http://www.speex.org/download/%{name}-%{version}.tar.gz
+Source0: 	http://www.speex.org/download/%{name}-1.2beta1.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	libogg-devel
 
-Patch0:	speex-underquoted.patch
-Patch1:	speex-1.0.4-pkgconfig.patch
+# don't build unneeded 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
@@ -23,15 +24,15 @@
 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
 speech. This package contains development files for %{name}
 
 %prep
-%setup -q
-%patch0 -p1 -b .underquoted
-%patch1 -p1 -b .pkgconfig
+%setup -q -n speex-1.2beta1
+%patch0 -p1 -b .test-progs
 
 %build
 %configure --enable-static --with-ogg-libraries=%{_libdir}
@@ -61,18 +62,20 @@
 %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
 %{_libdir}/libspeex.a
 
 %changelog
+* Tue Oct 24 2006 Matthias Clasen <mclasen at redhat.com> - 1.2-0.2.beta1
+- Rebuild 
+
+* Tue Oct 24 2006 Matthias Clasen <mclasen at redhat.com> - 1.2-0.1.beta1
+- Update to 1.2beta1
+- Require pkgconfig in the -devel package
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.0.5-2.1
 - rebuild