- Stop calling autoconf, this was no longer necessarry and in current

rawhide breaks us from building (because aclocal.m4 does not match the
    new autoconf version)
- Drop our last 2 patches, they were modifying configure, but since we
    called autoconf after that in effect they were not doing anything,
    review has confirmed that they indeed are no longer needed)
- Drop using system libtool hack, this is dangerous when the libtool used
    to generate ./configure and the one used differ
- Remove various antique checks (for example check if RPM_BUILD_ROOT == /)
- Drop unnecessary explicit library Requires
- Cleanup BuildRequires

vorbis-tools-1.0-build.patch

@@ -1,38 +0,0 @@
---- vorbis-tools-1.0/configure.foo	Wed Dec 11 17:33:13 2002
-+++ vorbis-tools-1.0/configure	Wed Dec 11 17:33:48 2002
-@@ -7366,7 +7366,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"
-@@ -7376,7 +7376,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
-@@ -7518,7 +7518,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
- 
-   VORBISFILE_LIBS="$VORBIS_LIBS -lvorbisfile"
-@@ -7530,7 +7530,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
- 
- 

vorbis-tools-1.0-curlconfig.patch

@@ -1,28 +0,0 @@
---- 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=""

vorbis-tools.spec

@@ -1,26 +1,14 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
-Patch0:		vorbis-tools-1.0-build.patch
-Patch1:		vorbis-tools-1.0-curlconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	libogg >= 2:1.1
+BuildRequires:	libvorbis-devel libao-devel curl-devel speex-devel flac-devel
-Requires:	libvorbis >= 1:%{version} 
-Requires:	libao >= 0.8.4
-BuildRequires:	libvorbis-devel >= 1:%{version}
-BuildRequires:  libao-devel >= 0.8.4
-BuildRequires:  curl-devel >= 7.8
-BuildRequires:	speex-devel 
-BuildRequires:  flac-devel
-BuildRequires:	libtool
-BuildRequires:	libogg-devel
-
 Obsoletes:	vorbis < %{epoch}:%{version}-%{release}
 Provides:	vorbis = %{epoch}:%{version}-%{release}
 
@@ -32,37 +20,47 @@ and variable bitrates from 16 to 128 kbps/channel.
 The vorbis package contains an encoder, a decoder, a playback tool, and a
 comment editor.
 
+
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
-%patch0 -p1
+
-%patch1 -p1
 
 %build
-autoconf
-perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
-perl -p -i -e "s/-ffast-math//" configure
-
 %configure
-export tagname=CC
+make %{?_smp_mflags}
-make LIBTOOL=/usr/bin/libtool
+
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
-export tagname=CC
+make DESTDIR=$RPM_BUILD_ROOT install
-make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install
-
 %find_lang %{name}
 
+
+%clean 
+rm -rf $RPM_BUILD_ROOT
+
+
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README ogg123/ogg123rc-example
 %{_bindir}/*
 %{_mandir}/man1/*
 
-%clean 
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat May 31 2008 Hans de Goede <j.w.r.degoede@hhs.n> - 1:1.2.0-2
+- Stop calling autoconf, this was no longer necessarry and in current
+  rawhide breaks us from building (because aclocal.m4 does not match
+  the new autoconf version)
+- Drop our last 2 patches, they were modifying configure, but since we called
+  autoconf after that in effect they were not doing anything, review has
+  confirmed that they indeed are no longer needed)
+- Drop using system libtool hack, this is dangerous when the libtool used
+  to generate ./configure and the one used differ
+- Remove various antique checks (for example check if RPM_BUILD_ROOT == /) 
+- Drop unnecessary explicit library Requires
+- Cleanup BuildRequires
+
 * Tue Mar 11 2008 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-1
 - update to 1.2.0
 - remove libcurl and oggdec patches, applied upstream