- added octave32.patch (now it builds with octave-3.2.*)

Changed files:
    libsndfile.spec -> 1.68
    octave32.patch -> 1.1

diff --git a/libsndfile.spec b/libsndfile.spec
index 26f581ab6f2285f3bbacbf382168935ae1948d43..13eea1beab3ddb66c8292cedb50f4eb459418c9c 100644 (file)
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -17,6 +17,7 @@ Vendor:               Erik de Castro Lopo <erikd@zip.com.au>
 Group:         Development/Libraries
 Source0:       http://www.mega-nerd.com/libsndfile/%{name}-%{version}.tar.gz
 # Source0-md5: e0553e12c7a467af44693e95e2eac668
+Patch0:                octave32.patch
 URL:           http://www.mega-nerd.com/libsndfile/
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf >= 2.54
@@ -108,6 +109,7 @@ Narzędzia z biblioteki libsndfile:
 
 %prep
 %setup -q
+%patch0 -p1
 
 %if %{without tests}
 %{__sed} -i 's, tests$,,' Makefile.am

diff --git a/octave32.patch b/octave32.patch
new file mode 100644 (file)
index 0000000..19081bd
--- /dev/null
+++ b/octave32.patch
@@ -0,0 +1,15 @@
+--- libsndfile-1.0.20/M4/octave.m4.orig        2009-10-25 15:51:00.461732576 +0100
++++ libsndfile-1.0.20/M4/octave.m4     2009-10-25 15:51:32.459533439 +0100
+@@ -125,6 +125,12 @@
+ 
+                               OCTAVE_BUILD=yes
+                               ;;
++                      3.2.*)
++                              OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir | sed 's%^/usr%${prefix}%'`
++                              OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir | sed 's%^/usr%${prefix}%'`
++
++                              OCTAVE_BUILD=yes
++                              ;;
+                       *)
+                               AC_MSG_WARN([Octave version $MKOCTFILE_VERSION is not supported.])
+                               ;;