- added link patch (fix linking issue globally), don't hide an error on x32auto/th/libsndfile-1.0.25-10

- disable octave just on x32
- release 10

2 files changed, 24 insertions, 9 deletions

diff --git a/libsndfile-link.patch b/libsndfile-link.patch
new file mode 100644
index 0000000..dea9bbb
--- /dev/null
+++ b/libsndfile-link.patch
@@ -0,0 +1,11 @@
+--- libsndfile-1.0.25/configure.ac.orig	2011-07-13 10:59:57.000000000 +0200
++++ libsndfile-1.0.25/configure.ac	2015-03-06 17:18:22.620080669 +0100
+@@ -335,7 +335,7 @@
+ 		enable_external_libs=yes
+ 
+ 		EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBISENC_CFLAGS $SPEEX_CFLAGS"
+-		EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS $SPEEX_LIBS"
++		EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS $VORBIS_LIBS $SPEEX_LIBS $OGG_LIBS"
+ 	else
+ 		echo
+ 		AC_MSG_WARN([[*** One or more of the external libraries (ie libflac, libogg and]])
diff --git a/libsndfile.spec b/libsndfile.spec
index ac079a6..1ac7251 100644
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -3,20 +3,24 @@
 #
 # Conditional build:
 %bcond_with	regtest		# build sndfile-regtest program
-%bcond_with	octave		# don't build octave binding
+%bcond_without	octave		# don't build octave binding
 %bcond_without	static_libs	# don't build static library
 %bcond_without	tests		# don't build tests
 #
+%ifarch x32
+%undefine	with_octave
+%endif
 Summary:	C library for reading and writing files containing sampled sound
 Summary(pl.UTF-8):	Biblioteka obsługi plików dźwiękowych
 Name:		libsndfile
 Version:	1.0.25
-Release:	9
+Release:	10
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.mega-nerd.com/libsndfile/files/%{name}-%{version}.tar.gz
 # Source0-md5:	e2b7bb637e01022c7d20f95f9c3990a2
 Patch0:		octave32.patch
+Patch1:		%{name}-link.patch
 URL:		http://www.mega-nerd.com/libsndfile/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.57
@@ -37,8 +41,6 @@ Requires:	libvorbis >= 1:1.2.3
 Obsoletes:	libsndfile1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define no_install_post_check_so 1
-
 %description
 Libsndfile is a C library for reading and writing files containing
 sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
@@ -115,6 +117,7 @@ dźwiękowych.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if %{without tests}
 %{__sed} -i 's, tests$,,' Makefile.am
@@ -126,12 +129,13 @@ dźwiękowych.
 %{__autoconf}
 %{__automake}
 %configure \
-	%{!?with_static_libs:--disable-static} \
-	%{!?with_regtest:--disable-sqlite}
+	--disable-silent-rules \
+	%{!?with_regtest:--disable-sqlite} \
+	%{!?with_static_libs:--disable-static}
+
+%{__make}
 
-%{__make} \
-	V=1
-%{?with_tests: %{__make} test}
+%{?with_tests:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT