packages: libsndfile/libsndfile.spec, libsndfile/octave32.patch - simpler o...

[baggins]

Author: baggins                      Date: Thu Apr 28 10:07:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simpler octave solution

---- Files affected:
packages/libsndfile:
   libsndfile.spec (1.75 -> 1.76) , octave32.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/libsndfile/libsndfile.spec
diff -u packages/libsndfile/libsndfile.spec:1.75 packages/libsndfile/libsndfile.spec:1.76
--- packages/libsndfile/libsndfile.spec:1.75	Fri Mar 25 17:14:37 2011
+++ packages/libsndfile/libsndfile.spec	Thu Apr 28 12:07:43 2011
@@ -12,7 +12,7 @@
 Summary(pl.UTF-8):	Biblioteka obsługi plików dźwiękowych
 Name:		libsndfile
 Version:	1.0.24
-Release:	1
+Release:	1.1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.mega-nerd.com/libsndfile/files/%{name}-%{version}.tar.gz
@@ -186,6 +186,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2011/04/28 10:07:43  baggins
+- simpler octave solution
+
 Revision 1.75  2011/03/25 16:14:37  qboosh
 - updated to 1.0.24
 

================================================================
Index: packages/libsndfile/octave32.patch
diff -u packages/libsndfile/octave32.patch:1.1 packages/libsndfile/octave32.patch:1.2
--- packages/libsndfile/octave32.patch:1.1	Mon Oct 26 07:07:06 2009
+++ packages/libsndfile/octave32.patch	Thu Apr 28 12:07:43 2011
@@ -1,15 +1,11 @@
 --- 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.])
+@@ -119,7 +119,7 @@
+ 			2.*)
+ 				AC_MSG_WARN([Octave version 2.X is not supported.])
  				;;
+-			3.0.*)
++			3.*)
+ 				OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir | sed 's%^/usr%${prefix}%'`
+ 				OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir | sed 's%^/usr%${prefix}%'`
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libsndfile/libsndfile.spec?r1=1.75&r2=1.76&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libsndfile/octave32.patch?r1=1.1&r2=1.2&f=u