From 60aa9d8550370a89c5e53a28171cc11db8d0ea7e Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Jul 24 2006 17:36:44 +0000
Subject: [tw]

- new version 12.18.1
- fixed multilib devel conflict in libst-config (#192751)

---

diff --git a/.cvsignore b/.cvsignore
index b718725..e009ccc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 sox-12.17.9.tar.gz
+sox-12.18.1.tar.gz
diff --git a/sources b/sources
index fd79bc1..5e1e163 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a463ef9ff2ec00007a3a42ced9572b03  sox-12.17.9.tar.gz
+b12507493d3c8571fa8b6e70a01d5438  sox-12.18.1.tar.gz
diff --git a/sox-12.18.1-multilib.patch b/sox-12.18.1-multilib.patch
new file mode 100644
index 0000000..b305ce3
--- /dev/null
+++ b/sox-12.18.1-multilib.patch
@@ -0,0 +1,18 @@
+--- sox-12.18.1/src/libst-config.in.multilib	2004-09-01 21:49:24.000000000 +0200
++++ sox-12.18.1/src/libst-config.in	2006-07-24 19:19:31.000000000 +0200
+@@ -6,7 +6,14 @@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ includedir="@includedir@"
+-libdir="@libdir@"
++arch=$(/bin/arch)
++if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" \
++    -o "$arch" = "ia64" ]; 
++then
++    libdir="@prefix@/lib64"
++else
++    libdir="@prefix@/lib"
++fi
+ libs='@LIBS@'
+ 
+ case "$1" in
diff --git a/sox.spec b/sox.spec
index 6c9a700..b90de74 100644
--- a/sox.spec
+++ b/sox.spec
@@ -1,10 +1,11 @@
 Summary: A general purpose sound file conversion tool.
 Name: sox
-Version: 12.17.9
-Release: 1.2.1
+Version: 12.18.1
+Release: 1
 License: GPL
 Group: Applications/Multimedia
 Source: http://prdownloads.sourceforge.net/sox/sox-%{version}.tar.gz
+Patch1: sox-12.18.1-multilib.patch
 URL: http://sox.sourceforge.net/
 BuildRequires: libvorbis-devel
 BuildRequires: alsa-lib-devel
@@ -25,6 +26,7 @@ which will use the SoX sound file format converter.
 
 %prep
 %setup -q 
+%patch1 -p1 -b .multilib
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" %configure --with-gsm --includedir=%{_includedir}/sox
@@ -66,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 24 2006 Thomas Woerner <twoerner@redhat.com> 12.18.1-1
+- new version 12.18.1
+- fixed multilib devel conflict in libst-config (#192751)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 12.17.9-1.2.1
 - rebuild