packages: octave/octave-build.patch, octave/octave.spec - updated to 3.6.1 ...

[qboosh]

Author: qboosh                       Date: Sat Mar  3 21:08:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.6.1
- updated build patch

---- Files affected:
packages/octave:
   octave-build.patch (1.3 -> 1.4) , octave.spec (1.135 -> 1.136) 

---- Diffs:

================================================================
Index: packages/octave/octave-build.patch
diff -u packages/octave/octave-build.patch:1.3 packages/octave/octave-build.patch:1.4
--- packages/octave/octave-build.patch:1.3	Fri Feb  3 18:35:32 2012
+++ packages/octave/octave-build.patch	Sat Mar  3 22:08:34 2012
@@ -11,15 +11,6 @@
  		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
 --- octave-3.6.0/configure.ac.orig	2012-01-15 19:05:01.000000000 +0100
 +++ octave-3.6.0/configure.ac	2012-02-02 21:02:27.006336076 +0100
-@@ -649,7 +649,7 @@
- 
- OCTAVE_CHECK_LIBRARY(qhull, QHull,
-   [Qhull library not found -- this will result in loss of functionality of some geometry functions.],
--  [qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], [qh_qhull], [], [],
-+  [libqhull/libqhull.h qhull/libqhull.h libqhull.h qhull/qhull.h qhull.h], [qh_qhull], [], [],
-   [warn_qhull=
-    OCTAVE_CHECK_QHULL_VERSION
-    OCTAVE_CHECK_QHULL_OK([TEXINFO_QHULL="@set HAVE_QHULL"
 @@ -1820,7 +1820,7 @@
  AC_CHECK_MEMBERS(struct group.gr_passwd)
  
@@ -29,55 +20,6 @@
    AC_CHECK_LIB(${termlib}, tputs, [
      TERM_LIBS="-l${termlib}"
      octave_found_termlib=yes
---- octave-3.6.0/m4/acinclude.m4.orig	2012-01-15 19:05:02.000000000 +0100
-+++ octave-3.6.0/m4/acinclude.m4	2012-02-02 21:06:49.699678206 +0100
-@@ -937,7 +937,13 @@
-     octave_cv_lib_qhull_version,  [
-       AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
--#if defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H)
-+#if defined (HAVE_LIBQHULL_LIBQHULL_H)
-+# include <libqhull/libqhull.h>
-+# include <libqhull/qset.h>
-+# include <libqhull/geom.h>
-+# include <libqhull/poly.h>
-+# include <libqhull/io.h>
-+#elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H)
- # if defined (HAVE_QHULL_LIBQHULL_H)
- #  include <qhull/libqhull.h>
- # else
-@@ -974,7 +980,13 @@
-     octave_cv_lib_qhull_ok, [
-       AC_RUN_IFELSE([AC_LANG_PROGRAM([[
- #include <stdio.h>
--#if defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H)
-+#if defined (HAVE_LIBQHULL_LIBQHULL_H)
-+# include <libqhull/libqhull.h>
-+# include <libqhull/qset.h>
-+# include <libqhull/geom.h>
-+# include <libqhull/poly.h>
-+# include <libqhull/io.h>
-+#elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H)
- # if defined (HAVE_QHULL_LIBQHULL_H)
- #  include <qhull/libqhull.h>
- # else
---- octave-3.6.0/src/DLD-FUNCTIONS/oct-qhull.h.orig	2012-01-15 19:05:02.000000000 +0100
-+++ octave-3.6.0/src/DLD-FUNCTIONS/oct-qhull.h	2012-02-02 21:16:01.689696688 +0100
-@@ -27,7 +27,13 @@
- 
- extern "C" {
- 
--#if defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H)
-+#if defined (HAVE_LIBQHULL_LIBQHULL_H)
-+# include <libqhull/libqhull.h>
-+# include <libqhull/qset.h>
-+# include <libqhull/geom.h>
-+# include <libqhull/poly.h>
-+# include <libqhull/io.h>
-+#elif defined (HAVE_QHULL_LIBQHULL_H) || defined (HAVE_QHULL_QHULL_H)
- # if defined (HAVE_QHULL_LIBQHULL_H)
- #  include <qhull/libqhull.h>
- # else
 --- octave-3.4.2/m4/ax_pthread.m4.orig	2011-04-11 16:57:08.000000000 +0200
 +++ octave-3.4.2/m4/ax_pthread.m4	2011-07-07 21:24:27.544492621 +0200
 @@ -169,6 +169,7 @@

================================================================
Index: packages/octave/octave.spec
diff -u packages/octave/octave.spec:1.135 packages/octave/octave.spec:1.136
--- packages/octave/octave.spec:1.135	Fri Feb  3 18:35:32 2012
+++ packages/octave/octave.spec	Sat Mar  3 22:08:34 2012
@@ -16,13 +16,13 @@
 Summary(sv.UTF-8):	GNU Octave - ett högninvåspråk för numeriska beräkningar
 Summary(zh_CN.UTF-8):	GNU Octave - 用于数字计算的高级语言。
 Name:		octave
-Version:	3.6.0
+Version:	3.6.1
 Release:	1
 Epoch:		2
 License:	GPL v3+
 Group:		Applications/Math
 Source0:	http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
-# Source0-md5:	095386ff5233b3daf7ff9ff78dc1334f
+# Source0-md5:	b543dd5ca743cba8c1d3474b1b99ae41
 Source1:	%{name}.desktop
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-build.patch
@@ -277,6 +277,10 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+# rebuild fails with "./octave.texi:130: Missing number, treated as zero."
+# so use hacks to avoid it (note: it must be done after configure regeneration)
+touch doc/interpreter/{version.texi,stamp-vti}
+touch doc/interpreter/octave.{dvi,ps,pdf}
 %configure \
 	--with-amd-includedir=%{_includedir}/amd \
 	--with-camd-includedir=%{_includedir}/camd \
@@ -367,6 +371,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.136  2012/03/03 21:08:34  qboosh
+- updated to 3.6.1
+- updated build patch
+
 Revision 1.135  2012/02/03 17:35:32  qboosh
 - updated to 3.6.0 (note: new sonames)
 - updated build patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/octave/octave-build.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/octave/octave.spec?r1=1.135&r2=1.136&f=u