- fix build with octave 4.0

- enable octave on x32

diff --git a/libsndfile.spec b/libsndfile.spec
index 1ac72518f1cfafac77923309c81f1789c26e740d..f455de6d7dc2dfd4ec0e904859e5bbe44849b684 100644 (file)
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -7,9 +7,6 @@
 %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

diff --git a/octave32.patch b/octave32.patch
index be42506f4b76e60f067aaebb466a72a18c5753b6..881bb8f3c47b4879d80190b0ecc47edbdcdbf2d1 100644 (file)
--- a/octave32.patch
+++ b/octave32.patch
@@ -5,7 +5,7 @@
                                AC_MSG_WARN([Octave version 2.X is not supported.])
                                ;;
 -                      3.0.*)
-+                      3.*)
++                      3.*|4.*)
                                OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir | sed 's%^/usr%${prefix}%'`
                                OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir | sed 's%^/usr%${prefix}%'`