From f7716b0a5119ca8429d5b184d4291b61df9f852a Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 07:50:42 +0000 Subject: [PATCH] auto-import changelog data from libvorbis-1.0-7.src.rpm Mon Feb 24 2003 Elliot Lee - rebuilt 1.0-6 - Fix #81026 by updating libvorbis-1.0-m4.patch Wed Jan 22 2003 Tim Powers - rebuilt 1.0-4 - add epochs to dependencies, to avoid 1.0rc3 >= 1.0 miscomparisons (#79374) - fix vorbis.m4 --- libvorbis-1.0-m4.patch | 49 ++++++++++++++++++++++++++++++++++++++++++ libvorbis.spec | 29 +++++++++++++++++++------ 2 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 libvorbis-1.0-m4.patch diff --git a/libvorbis-1.0-m4.patch b/libvorbis-1.0-m4.patch new file mode 100644 index 0000000..8f5a3a2 --- /dev/null +++ b/libvorbis-1.0-m4.patch @@ -0,0 +1,49 @@ +--- libvorbis-1.0/vorbis.m4.m4-patch 2002-07-09 09:08:57.000000000 -0400 ++++ libvorbis-1.0/vorbis.m4 2003-02-21 09:46:34.000000000 -0500 +@@ -20,7 +20,7 @@ + elif test "x$vorbis_prefix" != "x" ; then + VORBIS_LIBS="-L$vorbis_prefix/lib" + elif test "x$prefix" != "xNONE"; then +- VORBIS_LIBS="-L$prefix/lib" ++ VORBIS_LIBS="-L$libdir" + fi + + VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" +@@ -32,7 +32,7 @@ + elif test "x$vorbis_prefix" != "x" ; then + VORBIS_CFLAGS="-I$vorbis_prefix/include" + elif test "x$prefix" != "xNONE"; then +- VORBIS_CFLAGS="-I$prefix/include" ++ VORBIS_CFLAGS="" + fi + + +@@ -62,7 +62,7 @@ + vorbis_info vi; + + vorbis_info_init (&vi); +- vorbis_encode_init (&vi, 2, 44100, -1, 128, -1); ++ vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1); + vorbis_analysis_init (&vd, &vi); + vorbis_block_init (&vd, &vb); + /* this function was added in 1.0rc3, so this is what we're testing for */ +--- libvorbis-1.0/configure.m4-patch 2002-07-19 08:26:08.000000000 -0400 ++++ libvorbis-1.0/configure 2003-02-21 09:46:22.000000000 -0500 +@@ -5704,7 +5704,7 @@ + elif test "x$ogg_prefix" != "x" ; then + OGG_LIBS="-L$ogg_prefix/lib" + elif test "x$prefix" != "xNONE" ; then +- OGG_LIBS="-L$prefix/lib" ++ OGG_LIBS="-L$libdir" + fi + + OGG_LIBS="$OGG_LIBS -logg" +@@ -5714,7 +5714,7 @@ + elif test "x$ogg_prefix" != "x" ; then + OGG_CFLAGS="-I$ogg_prefix/include" + elif test "x$prefix" != "xNONE"; then +- OGG_CFLAGS="-I$prefix/include" ++ OGG_CFLAGS="" + fi + + echo $ac_n "checking for Ogg""... $ac_c" 1>&6 diff --git a/libvorbis.spec b/libvorbis.spec index 2988e98..2111c73 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -1,15 +1,16 @@ Summary: The Vorbis General Audio Compression Codec. Name: libvorbis Version: 1.0 -Release: 2 -Serial: 1 +Release: 7 +Epoch: 1 Group: System Environment/Libraries Copyright: BSD URL: http://www.xiph.org/ Source: http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz +Patch: libvorbis-1.0-m4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: libogg >= %{version} -BuildPrereq: libogg-devel >= %{version} +Requires: libogg >= 2:%{version} +BuildPrereq: libogg-devel >= 2:%{version} %description Ogg Vorbis is a fully open, non-proprietary, patent-and royalty-free, @@ -22,8 +23,8 @@ that support Ogg Voribs. %package devel Summary: Development tools for Vorbis applications. Group: Development/Libraries -Requires: libogg-devel >= %{version} -Requires: libvorbis = %{version} +Requires: libogg-devel >= 2:%{version} +Requires: libvorbis = %{epoch}:%{version} Obsoletes: vorbis-devel %description devel @@ -31,7 +32,9 @@ The libvorbis-devel package contains the header files and documentation needed to develop applications with Ogg Vorbis. %prep + %setup -q +%patch -p1 -b .m4-patch perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure perl -p -i -e "s/-ffast-math//" configure @@ -79,6 +82,20 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %postun -p /sbin/ldconfig %changelog +* Mon Feb 24 2003 Elliot Lee +- rebuilt + +* Fri Feb 21 2003 Elliot lee 1:1.0-6 +- Fix #81026 by updating libvorbis-1.0-m4.patch + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Wed Dec 11 2002 Bill Nottingham 1:1.0-4 +- add epochs to dependencies, to avoid 1.0rc3 >= 1.0 miscomparisons + (#79374) +- fix vorbis.m4 + * Fri Nov 29 2002 Tim Powers 1:1.0-2 - remove unpackaged files from the buildroot - tell configure where ogg libs are