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

qboosh qboosh at pld-linux.org
Fri Feb 3 18:35:37 CET 2012 

Author: qboosh                       Date: Fri Feb  3 17:35:37 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.6.0 (note: new sonames)
- updated build patch

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

---- Diffs:

================================================================
Index: packages/octave/octave-build.patch
diff -u packages/octave/octave-build.patch:1.2 packages/octave/octave-build.patch:1.3
--- packages/octave/octave-build.patch:1.2	Fri Jul  8 20:47:52 2011
+++ packages/octave/octave-build.patch	Fri Feb  3 18:35:32 2012
@@ -9,18 +9,18 @@
  	@$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT)
  	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
  		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
---- octave-3.4.0/configure.ac~	2011-02-08 11:01:12.000000000 +0100
-+++ octave-3.4.0/configure.ac	2011-04-14 11:38:50.030497595 +0200
-@@ -631,7 +631,7 @@
+--- 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/qhull_a.h], [qh_qhull], [], [],
-+  [libqhull/qhull_a.h], [qh_qhull], [], [],
+-  [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"
-@@ -1731,7 +1731,7 @@
+@@ -1820,7 +1820,7 @@
  AC_CHECK_MEMBERS(struct group.gr_passwd)
  
  octave_found_termlib=no
@@ -29,59 +29,55 @@
    AC_CHECK_LIB(${termlib}, tputs, [
      TERM_LIBS="-l${termlib}"
      octave_found_termlib=yes
---- octave-3.4.2/m4/acinclude.m4.orig	2011-06-10 19:48:38.000000000 +0200
-+++ octave-3.4.2/m4/acinclude.m4	2011-07-07 18:21:32.660791806 +0200
-@@ -935,7 +935,7 @@
-   [AC_CACHE_CHECK([for qh_version in $QHULL_LIBS],
+--- 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 <qhull/qhull_a.h>
-+#include <libqhull/qhull_a.h>
- ]], [[
- const char *tmp = qh_version;
- ]])], [octave_cv_lib_qhull_version=yes], [octave_cv_lib_qhull_version=no])])
-@@ -952,7 +952,7 @@
+ #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>
--#include <qhull/qhull.h>
-+#include <libqhull/qhull_a.h>
- #ifdef NEED_QHULL_VERSION
- char *qh_version = "version";
- #endif
---- octave-3.4.2/src/DLD-FUNCTIONS.orig/convhulln.cc	2011-04-11 16:57:08.000000000 +0200
-+++ octave-3.4.2/src/DLD-FUNCTIONS/convhulln.cc	2011-07-07 18:23:18.760795361 +0200
-@@ -43,7 +43,7 @@
- 
- #ifdef HAVE_QHULL
- extern "C" {
--#include <qhull/qhull_a.h>
-+#include <libqhull/qhull_a.h>
- }
- 
- # ifdef NEED_QHULL_VERSION
---- octave-3.4.2/src/DLD-FUNCTIONS.orig/__delaunayn__.cc	2011-04-11 16:57:08.000000000 +0200
-+++ octave-3.4.2/src/DLD-FUNCTIONS/__delaunayn__.cc	2011-07-07 18:23:18.774128693 +0200
-@@ -52,7 +52,7 @@
- 
- #ifdef HAVE_QHULL
- extern "C" {
--#include <qhull/qhull_a.h>
-+#include <libqhull/qhull_a.h>
- }
- 
- #ifdef NEED_QHULL_VERSION
---- octave-3.4.2/src/DLD-FUNCTIONS.orig/__voronoi__.cc	2011-04-11 16:57:08.000000000 +0200
-+++ octave-3.4.2/src/DLD-FUNCTIONS/__voronoi__.cc	2011-07-07 18:23:19.144128708 +0200
-@@ -45,7 +45,7 @@
+-#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 @@
  
- #ifdef HAVE_QHULL
  extern "C" {
--#include <qhull/qhull_a.h>
-+#include <libqhull/qhull_a.h>
- }
  
- #ifdef NEED_QHULL_VERSION
+-#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.134 packages/octave/octave.spec:1.135
--- packages/octave/octave.spec:1.134	Fri Jan 13 22:02:33 2012
+++ packages/octave/octave.spec	Fri Feb  3 18:35:32 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.4.3
-Release:	2
+Version:	3.6.0
+Release:	1
 Epoch:		2
 License:	GPL v3+
 Group:		Applications/Math
 Source0:	http://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
-# Source0-md5:	185b08f4e4a7b646d76e4d33b77fa87e
+# Source0-md5:	095386ff5233b3daf7ff9ff78dc1334f
 Source1:	%{name}.desktop
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-build.patch
@@ -286,9 +286,7 @@
 	--with-cxsparse-includedir=%{_includedir}/cxsparse \
 	--with-umfpack-includedir=%{_includedir}/umfpack \
 	--enable-dl \
-	--enable-shared \
-	--enable-static=no \
-	--enable-rpath=no
+	--enable-shared
 
 %{__make} \
 	octincludedir=%{_includedir}/octave \
@@ -338,11 +336,11 @@
 %attr(755,root,root) %{_bindir}/octave
 %attr(755,root,root) %{_bindir}/octave-%{version}
 %attr(755,root,root) %{_libdir}/libcruft.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcruft.so.0
+%attr(755,root,root) %ghost %{_libdir}/libcruft.so.1
 %attr(755,root,root) %{_libdir}/liboctave.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctave.so.0
+%attr(755,root,root) %ghost %{_libdir}/liboctave.so.1
 %attr(755,root,root) %{_libdir}/liboctinterp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.0
+%attr(755,root,root) %ghost %{_libdir}/liboctinterp.so.1
 %{_libdir}/octave
 %{_infodir}/octave.info*
 %{_infodir}/OctaveFAQ.info*
@@ -369,6 +367,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2012/02/03 17:35:32  qboosh
+- updated to 3.6.0 (note: new sonames)
+- updated build patch
+
 Revision 1.134  2012/01/13 21:02:33  arekm
 - release 2
 
================================================================

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

More information about the pld-cvs-commit mailing list