From 6952dcdd9ac325e1d3de341f73bedd5f3930690f Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 14:06:15 +0000
Subject: [PATCH] auto-import changelog data from vorbis-tools-1.0-7.src.rpm
 Tue Oct 21 2003 Bill Nottingham <notting@redhat.com> 1.0-7 - rebuild
 (#107673) Fri Sep 05 2003 Bill Nottingham <notting@redhat.com> 1.0-6 - fix
 curl detection so ogg123 gets built (#103831) Thu Aug 07 2003 Elliot Lee
 <sopwith@redhat.com> 1.0-5 - Fix link errors Wed Jun 04 2003 Elliot Lee
 <sopwith@redhat.com> - rebuilt Tue Jun 03 2003 Jeff Johnson <jbj@redhat.com>
 - add explicit epoch's where needed.

---
 vorbis-tools-1.0-curlconfig.patch | 28 +++++++++++++++++++++++++++
 vorbis-tools.spec                 | 32 +++++++++++++++++++++++++------
 2 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 vorbis-tools-1.0-curlconfig.patch

diff --git a/vorbis-tools-1.0-curlconfig.patch b/vorbis-tools-1.0-curlconfig.patch
new file mode 100644
index 0000000..faf2fc0
--- /dev/null
+++ b/vorbis-tools-1.0-curlconfig.patch
@@ -0,0 +1,28 @@
+--- vorbis-tools-1.0/configure.sopwith	Thu Aug  7 13:24:03 2003
++++ vorbis-tools-1.0/configure	Thu Aug  7 13:25:27 2003
+@@ -425,23 +425,9 @@
+ 
+ if test "x$curl_prefix" != "xno" ; then
+ 
+-  if test "x$curl_libraries" != "x" ; then
+-    CURL_LIBS="-L$curl_libraries"
+-  elif test "x$curl_prefix" != "x" ; then
+-    CURL_LIBS="-L$curl_prefix/lib"
+-  elif test "x$prefix" != "xNONE" ; then
+-    CURL_LIBS="-L$prefix/lib"
+-  fi
++  CURL_LIBS="`curl-config --libs`"
++  CURL_CFLAGS="`curl-config --cflags`"
+ 
+-  CURL_LIBS="$CURL_LIBS -lcurl"
+-
+-  if test "x$curl_includes" != "x" ; then
+-    CURL_CFLAGS="-I$curl_includes"
+-  elif test "x$curl_prefix" != "x" ; then
+-    CURL_CFLAGS="-I$curl_prefix/include"
+-  elif test "x$prefix" != "xNONE"; then
+-    CURL_CFLAGS="-I$prefix/include"
+-  fi
+ 
+   AC_MSG_CHECKING(for libcurl)
+   no_curl=""
diff --git a/vorbis-tools.spec b/vorbis-tools.spec
index 13bb5d5..4f3a631 100644
--- a/vorbis-tools.spec
+++ b/vorbis-tools.spec
@@ -1,16 +1,17 @@
 Summary: The Vorbis General Audio Compression Codec tools.
 Name:		vorbis-tools
 Version:	1.0
-Release: 3
-Serial:		1
+Release:	7
+Epoch:		1
 Group: Applications/Multimedia
 License:	GPL
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch:		vorbis-tools-1.0-build.patch
+Patch1:		vorbis-tools-1.0-curlconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Requires:	libogg >= %{version}, libvorbis >= %{version}, libao >= 0.8.3
-BuildPrereq:	libvorbis-devel >= %{version}, libao-devel >= 0.8.3, curl-devel >= 7.8
+Requires:	libogg >= 2:%{version}, libvorbis >= 1:%{version}, libao >= 0.8.3
+BuildPrereq:	libvorbis-devel >= 1:%{version}, libao-devel >= 0.8.3, curl-devel >= 7.8
 Obsoletes:	vorbis
 Provides:	vorbis
 
@@ -25,16 +26,20 @@ comment editor.
 %prep
 %setup -q -n %{name}-%{version}
 %patch -p1
+%patch1 -p1
 
 %build
 perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
 perl -p -i -e "s/-ffast-math//" configure
+
 %configure
-make
+export tagname=CC
+make LIBTOOL=/usr/bin/libtool
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+export tagname=CC
+make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install
 
 %find_lang %{name}
 
@@ -48,6 +53,21 @@ make DESTDIR=$RPM_BUILD_ROOT install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Oct 21 2003 Bill Nottingham <notting@redhat.com> 1.0-7
+- rebuild (#107673)
+
+* Fri Sep  5 2003 Bill Nottingham <notting@redhat.com> 1.0-6
+- fix curl detection so ogg123 gets built (#103831)
+
+* Thu Aug  7 2003 Elliot Lee <sopwith@redhat.com> 1.0-5
+- Fix link errors
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Jun  3 2003 Jeff Johnson <jbj@redhat.com>
+- add explicit epoch's where needed.
+
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt