From 2e901577a339c5edb4cb57c501128b79bef91f4a Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Jul 24 2008 12:53:14 +0000 Subject: - update to 1.2rc1 - move manual.pdf to -devel --- diff --git a/.cvsignore b/.cvsignore index 6a4288b..57cfccf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -speex-1.2beta3.tar.gz +speex-1.2rc1.tar.gz diff --git a/sources b/sources index 3db69ac..8bd92a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcada04dc663a725ee7fcfa6301520a3 speex-1.2beta3.tar.gz +c4438b22c08e5811ff10e2b06ee9b9ae speex-1.2rc1.tar.gz diff --git a/speex-1.0.4-pkgconfig.patch b/speex-1.0.4-pkgconfig.patch deleted file mode 100644 index f3e7db2..0000000 --- a/speex-1.0.4-pkgconfig.patch +++ /dev/null @@ -1,16 +0,0 @@ -This is a minmal fix by Michael Schwendt. -What upstream does in 1.1.6 is AC_SUBST(SPEEX_VERSION) in configure.ac, -which would require (autoreconf) during build. - -diff -Nur speex-1.0.4-orig/speex.pc.in speex-1.0.4/speex.pc.in ---- speex-1.0.4-orig/speex.pc.in 2004-07-14 07:29:06.000000000 +0200 -+++ speex-1.0.4/speex.pc.in 2004-10-18 03:46:48.475154816 +0200 -@@ -7,7 +7,7 @@ - - Name: speex - Description: Speex is an audio codec tuned for speech --Version: @SPEEX_VERSION@ -+Version: @VERSION@ - Requires: ogg - Conflicts: - Libs: -L${libdir} -lspeex diff --git a/speex-1.2-CVE-2008-1686.diff b/speex-1.2-CVE-2008-1686.diff deleted file mode 100644 index 066432e..0000000 --- a/speex-1.2-CVE-2008-1686.diff +++ /dev/null @@ -1,21 +0,0 @@ -Patch for CVE-2008-1686, see: -https://trac.xiph.org/changeset/14701 -http://www.ocert.org/advisories/ocert-2008-2.html - -diff -pruN speex-1.2beta2.orig/libspeex/speex_header.c speex-1.2beta2/libspeex/speex_header.c ---- speex-1.2beta2.orig/libspeex/speex_header.c 2007-03-18 13:25:09.000000000 +0100 -+++ speex-1.2beta2/libspeex/speex_header.c 2008-04-15 17:15:18.000000000 +0200 -@@ -161,6 +161,13 @@ SpeexHeader *speex_packet_to_header(char - ENDIAN_SWITCH(le_header->frames_per_packet); - ENDIAN_SWITCH(le_header->extra_headers); - -+ if (le_header->mode >= SPEEX_NB_MODES || le_header->mode < 0) -+ { -+ speex_warning ("Invalid mode specified in Speex header"); -+ speex_free (le_header); -+ return NULL; -+ } -+ - return le_header; - - } diff --git a/speex-1.2beta1-test-progs.patch b/speex-1.2beta1-test-progs.patch deleted file mode 100644 index c67aed3..0000000 --- a/speex-1.2beta1-test-progs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- speex-1.2beta1/libspeex/Makefile.in.test-progs 2006-10-24 12:52:40.000000000 -0400 -+++ speex-1.2beta1/libspeex/Makefile.in 2006-10-24 12:54:06.000000000 -0400 -@@ -42,8 +42,8 @@ - PRE_UNINSTALL = : - POST_UNINSTALL = : - host_triplet = @host@ --noinst_PROGRAMS = testenc$(EXEEXT) testenc_wb$(EXEEXT) \ -- testenc_uwb$(EXEEXT) testdenoise$(EXEEXT) testecho$(EXEEXT) -+# noinst_PROGRAMS = testenc$(EXEEXT) testenc_wb$(EXEEXT) \ -+# testenc_uwb$(EXEEXT) testdenoise$(EXEEXT) testecho$(EXEEXT) - subdir = libspeex - DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in diff --git a/speex-underquoted.patch b/speex-underquoted.patch deleted file mode 100644 index 2392caf..0000000 --- a/speex-underquoted.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- speex-1.0.4/speex.m4.underquoted 2004-08-11 16:20:05.504669757 +0100 -+++ speex-1.0.4/speex.m4 2004-08-11 16:20:10.890645720 +0100 -@@ -7,7 +7,7 @@ - dnl XIPH_PATH_SPEEX([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) - dnl Test for libspeex, and define SPEEX_CFLAGS and SPEEX_LIBS - dnl --AC_DEFUN(XIPH_PATH_SPEEX, -+AC_DEFUN([XIPH_PATH_SPEEX], - [dnl - dnl Get the cflags and libraries - dnl diff --git a/speex.spec b/speex.spec index 9c5a60a..2f0abc8 100644 --- a/speex.spec +++ b/speex.spec @@ -1,19 +1,15 @@ Summary: A voice compression format (codec) Name: speex Version: 1.2 -Release: 0.9.beta3 +%define rc_ver rc1 +Release: 0.10.%{rc_ver}%{?dist} License: BSD Group: System Environment/Libraries URL: http://www.speex.org/ -Source0: http://downloads.us.xiph.org/releases/speex/%{name}-1.2beta3.tar.gz +Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.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 -Patch1: speex-1.2-CVE-2008-1686.diff - %description Speex is a patent-free compression format designed especially for speech. It is specialized for voice communications at low bit-rates in @@ -41,10 +37,7 @@ Speex is a patent-free compression format designed especially for speech. This package contains tools files and user's manual for %{name}. %prep -%setup -q -n speex-1.2beta3 -%patch0 -p1 -b .test-progs -%patch1 -p1 -b .CVE-2008-1686 -chmod a-x README +%setup -q -n %{name}-%{version}%{rc_ver} %build %configure --disable-static @@ -71,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) +%doc doc/manual.pdf %{_includedir}/speex %{_datadir}/aclocal/speex.m4 %{_libdir}/pkgconfig/speex*.pc @@ -79,13 +73,16 @@ rm -rf $RPM_BUILD_ROOT %files tools %defattr(-,root,root,-) -%doc doc/manual.pdf %{_bindir}/speexenc %{_bindir}/speexdec %{_mandir}/man1/speexenc.1* %{_mandir}/man1/speexdec.1* %changelog +* Thu Jul 24 2008 Miroslav Lichvar - 1.2-0.10.rc1 +- update to 1.2rc1 +- move manual.pdf to -devel + * Tue May 13 2008 Marcela Maslanova - 1.2-0.9.beta3 - polishing review (many thanks to Matthias Saou)