[octave/f15] Update to 3.4.2.

Sat Aug 6 10:03:29 UTC 2011

commit 462683cbbeab4ff3457be19b628deea7e4201722
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sat Aug 6 13:03:15 2011 +0300

    Update to 3.4.2.

 octave-3.4.0-gcc46.patch  |   24 ---------------
 octave-3.4.0-libdir.patch |   72 ---------------------------------------------
 octave-3.4.2-curl.patch   |   11 +++++++
 octave.spec               |   60 ++++++++++++++++++++-----------------
 sources                   |    2 +-
 5 files changed, 45 insertions(+), 124 deletions(-)
---

diff --git a/octave-3.4.2-curl.patch b/octave-3.4.2-curl.patch
new file mode 100644
index 0000000..0e44063
--- /dev/null
+++ b/octave-3.4.2-curl.patch
@@ -0,0 +1,11 @@
+diff -up octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc.curl octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc
+--- octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc.curl	2011-06-09 20:22:32.000000000 +0300
++++ octave-3.4.2/src/DLD-FUNCTIONS/urlwrite.cc	2011-08-06 11:54:58.331640323 +0300
+@@ -52,7 +52,6 @@ along with Octave; see the file COPYING.
+ 
+ #include <curl/curl.h>
+ #include <curl/curlver.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ static int
diff --git a/octave.spec b/octave.spec
index 7544b7f..a7a23a0 100644
--- a/octave.spec
+++ b/octave.spec
@@ -1,19 +1,17 @@
 # From src/version.h:#define OCTAVE_API_VERSION
-%global octave_api api-v47+
+%global octave_api api-v45+
 
 Name:           octave
-Version:        3.4.0
-Release:        6%{?dist}
+Version:        3.4.2
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 Group:          Applications/Engineering
 License:        GPLv3+
 Source0:        ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2
 Source1:        macros.octave
-# Add missing cstddef for gcc 4.6
-Patch0:         octave-3.4.0-gcc46.patch
-# Use libdir instead of libexecdir
-Patch1:         octave-3.4.0-libdir.patch
+# Don't include <curl/types.h> which isn't used and is missing on newer versions of libcurl
+Patch0:		octave-3.4.2-curl.patch
 # https://savannah.gnu.org/bugs/index.php?32839
 # Fix building packages from directories
 Patch2:         octave-3.4.0-pkgbuilddir.patch
@@ -28,6 +26,7 @@ BuildRequires:  readline-devel glibc-devel fftw-devel gperf ghostscript
 BuildRequires:  curl-devel pcre-devel texinfo-tex arpack-devel libX11-devel
 BuildRequires:  suitesparse-devel glpk-devel gnuplot desktop-file-utils
 BuildRequires:  GraphicsMagick-c++-devel fltk-devel ftgl-devel qrupdate-devel
+BuildRequires:  tex(dvips)
 
 Requires:        gnuplot gnuplot-common less info texinfo 
 Requires(post):  info
@@ -73,15 +72,8 @@ This package contains documentation for Octave.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc46
-%patch1 -p1 -b .libdir
+%patch0 -p1 -b .curl
 %patch2 -p1 -b .pkgbuilddir
-# Check that octave_api is set correctly
-if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
-then
-  echo "octave_api variable in spec does not match src/version.h"
-  exit 1
-fi
 
 # Check permissions
 find -name *.cc -exec chmod 644 {} \;
@@ -97,7 +89,16 @@ export F77=gfortran
  --with-lapack="-L%{_libdir}/atlas -llapack" \
  --with-amd --with-umfpack --with-colamd --with-ccolamd --with-cholmod \
  --with-cxsparse
-make OCTAVE_RELEASE="Fedora %{version}-%{release}"
+
+# Check that octave_api is set correctly (autogenerated file)
+make -C src version.h
+if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
+then
+  echo "octave_api variable in spec does not match src/version.h"
+  exit 1
+fi
+
+make OCTAVE_RELEASE="Fedora %{version}-%{release}" %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -187,12 +188,8 @@ sed -i -e '/^# Created by Octave/d' %{buildroot}%{_datadir}/%{name}/%{version}/e
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cp -p %SOURCE1 %{buildroot}%{_sysconfdir}/rpm/
 
-
-# TODO - Fix this:
-#  src/DLD-FUNCTIONS/md5sum.cc ............................*** stack smashing detected ***: /builddir/build/BUILD/octave-3.3.54/src/.libs/lt-octave terminated
-#%check
-#make check
-
+%check
+make check
 
 %clean
 rm -rf %{buildroot}
@@ -211,8 +208,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog* COPYING NEWS* PROJECTS README README.Linux
-%doc README.kpathsea
+%doc AUTHORS BUGS ChangeLog COPYING NEWS README
 # FIXME: Create an -emacs package that has the emacs addon
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/octave-*.conf
 %config(noreplace) %{_sysconfdir}/rpm/macros.octave
@@ -248,9 +244,18 @@ fi
 
 
 %changelog
-* Fri Apr 8 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-6
-- Fix typo on octave_api macro
-- Remove rm from octave_pkg_preun macro
+* Sat Aug 06 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6:3.4.2-1
+- Update to 3.4.2.
+
+* Fri May 27 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-8
+- Add patch to fix Fl_File_Chooser.H location
+- Add BR tex(dvips)
+
+* Thu May 26 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-7
+- Rebuild for fltk 1.3.0
+
+* Tue May 17 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-6
+- Rebuild for hdf5 1.8.7
 
 * Fri Mar 18 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-5
 - Use libdir instead of libexecdir
@@ -258,6 +263,7 @@ fi
 - Fix multilib installs
 - Re-enable prelinking, seems to work
 - Add patch to enable building packages from directories
+>>>>>>> c9d48722b5642ad74c3504a69163771eb4b11d9d
 
 * Wed Feb 23 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.0-4
 - Update rpm macros per FPC comments
diff --git a/sources b/sources
index 14057a2..51f6ebc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8144cee1d37e645d3368a8e8a5f1856  octave-3.4.0.tar.bz2
+31c744ab4555a2bf04d5e644b93f9b51  octave-3.4.2.tar.bz2
