Update to 3.4.2.
This commit is contained in:
Jussi Lehtola
parent
c9d48722b5
commit
da03b090e0
|
|
@ -1,24 +0,0 @@
|
|||
diff -up octave-3.4.0/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc.fltk octave-3.4.0/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc
|
||||
--- octave-3.4.0/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc.fltk 2011-02-08 03:00:52.000000000 -0700
|
||||
+++ octave-3.4.0/src/DLD-FUNCTIONS/__fltk_uigetfile__.cc 2011-05-26 14:09:51.277484258 -0600
|
||||
@@ -27,7 +27,7 @@ along with Octave; see the file COPYING.
|
||||
#if defined (HAVE_FLTK)
|
||||
|
||||
#include <FL/Fl.H>
|
||||
-#include <Fl/Fl_File_Chooser.H>
|
||||
+#include <FL/Fl_File_Chooser.H>
|
||||
|
||||
// FLTK headers may include X11/X.h which defines Complex, and that
|
||||
// conflicts with Octave's Complex typedef. We don't need the X11
|
||||
diff -up octave-3.4.0/src/DLD-FUNCTIONS/__init_fltk__.cc.fltk octave-3.4.0/src/DLD-FUNCTIONS/__init_fltk__.cc
|
||||
--- octave-3.4.0/src/DLD-FUNCTIONS/__init_fltk__.cc.fltk 2011-05-26 14:10:40.447667595 -0600
|
||||
+++ octave-3.4.0/src/DLD-FUNCTIONS/__init_fltk__.cc 2011-05-26 14:10:14.456627808 -0600
|
||||
@@ -44,7 +44,7 @@ To initialize:
|
||||
#include <FL/Fl_Box.H>
|
||||
#include <FL/Fl_Button.H>
|
||||
#include <FL/Fl_Choice.H>
|
||||
-#include <Fl/Fl_File_Chooser.H>
|
||||
+#include <FL/Fl_File_Chooser.H>
|
||||
#include <FL/Fl_Gl_Window.H>
|
||||
#include <FL/Fl_Menu_Bar.H>
|
||||
#include <FL/Fl_Menu_Button.H>
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h
|
||||
--- octave-3.4.0/liboctave/oct-alloc.h.gcc46 2011-02-08 03:00:51.000000000 -0700
|
||||
+++ octave-3.4.0/liboctave/oct-alloc.h 2011-02-08 09:41:23.984081687 -0700
|
||||
@@ -23,6 +23,8 @@ along with Octave; see the file COPYING.
|
||||
#if !defined (octave_oct_alloc_h)
|
||||
#define octave_oct_alloc_h 1
|
||||
|
||||
+#include <cstddef>
|
||||
+
|
||||
class
|
||||
OCTAVE_API
|
||||
octave_allocator
|
||||
diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc
|
||||
--- octave-3.4.0/src/pr-output.cc.gcc46 2011-02-08 03:00:52.000000000 -0700
|
||||
+++ octave-3.4.0/src/pr-output.cc 2011-02-08 09:55:16.149662744 -0700
|
||||
@@ -3024,7 +3024,7 @@ abs (T x)
|
||||
}
|
||||
|
||||
#define INSTANTIATE_ABS(T) \
|
||||
- template /* static */ inline T abs (T)
|
||||
+ template /* static */ T abs (T)
|
||||
|
||||
INSTANTIATE_ABS(signed char);
|
||||
INSTANTIATE_ABS(short);
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
--- octave-3.4.0/configure.libdir 2011-02-08 03:03:31.000000000 -0700
|
||||
+++ octave-3.4.0/configure 2011-03-18 10:35:25.014978076 -0600
|
||||
@@ -6680,7 +6680,7 @@
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octetcdir to be $octetcdir" >&5
|
||||
$as_echo "defining octetcdir to be $octetcdir" >&6; }
|
||||
|
||||
-: ${octlibdir='$(libdir)/octave-$(version)'}
|
||||
+: ${octlibdir='$(libdir)/octave/$(version)'}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octlibdir to be $octlibdir" >&5
|
||||
$as_echo "defining octlibdir to be $octlibdir" >&6; }
|
||||
|
||||
@@ -6700,19 +6700,19 @@
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localverarchlibdir to be $localverarchlibdir" >&5
|
||||
$as_echo "defining localverarchlibdir to be $localverarchlibdir" >&6; }
|
||||
|
||||
-: ${octfiledir='$(libexecdir)/octave/$(version)/oct/$(canonical_host_type)'}
|
||||
+: ${octfiledir='$(libdir)/octave/$(version)/oct'}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octfiledir to be $octfiledir" >&5
|
||||
$as_echo "defining octfiledir to be $octfiledir" >&6; }
|
||||
|
||||
-: ${localoctfiledir='$(libexecdir)/octave/site/oct/$(canonical_host_type)'}
|
||||
+: ${localoctfiledir='$(libdir)/octave/site/oct'}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localoctfiledir to be $localoctfiledir" >&5
|
||||
$as_echo "defining localoctfiledir to be $localoctfiledir" >&6; }
|
||||
|
||||
-: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)'}
|
||||
+: ${localapioctfiledir='$(libdir)/octave/site/oct/$(api_version)'}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localapioctfiledir to be $localapioctfiledir" >&5
|
||||
$as_echo "defining localapioctfiledir to be $localapioctfiledir" >&6; }
|
||||
|
||||
-: ${localveroctfiledir='$(libexecdir)/octave/$(version)/site/oct/$(canonical_host_type)'}
|
||||
+: ${localveroctfiledir='$(libdir)/octave/$(version)/site/oct'}
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localveroctfiledir to be $localveroctfiledir" >&5
|
||||
$as_echo "defining localveroctfiledir to be $localveroctfiledir" >&6; }
|
||||
|
||||
--- octave-3.4.0/scripts/pkg/pkg.m.libdir 2011-03-18 09:34:11.258406127 -0600
|
||||
+++ octave-3.4.0/scripts/pkg/pkg.m 2011-03-18 10:56:58.763177238 -0600
|
||||
@@ -248,7 +248,7 @@
|
||||
if (prefix == -1)
|
||||
if (global_install)
|
||||
prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
|
||||
- archprefix = fullfile (octave_config_info ("libexecdir"),
|
||||
+ archprefix = fullfile (octave_config_info ("libdir"),
|
||||
"octave", "packages");
|
||||
else
|
||||
prefix = fullfile ("~", "octave");
|
||||
@@ -293,7 +293,7 @@
|
||||
global_install = true;
|
||||
if (! user_prefix)
|
||||
prefix = fullfile (OCTAVE_HOME (), "share", "octave", "packages");
|
||||
- archprefix = fullfile (octave_config_info ("libexecdir"),
|
||||
+ archprefix = fullfile (octave_config_info ("libdir"),
|
||||
"octave", "packages");
|
||||
endif
|
||||
case available_actions
|
||||
@@ -2211,14 +2211,13 @@
|
||||
endfunction
|
||||
|
||||
function arch = getarch ()
|
||||
- persistent _arch = cstrcat (octave_config_info("canonical_host_type"), ...
|
||||
- "-", octave_config_info("api_version"));
|
||||
+ persistent _arch = octave_config_info("api_version");
|
||||
arch = _arch;
|
||||
endfunction
|
||||
|
||||
function archprefix = getarchprefix (desc, global_install)
|
||||
if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ()))
|
||||
- archprefix = fullfile (octave_config_info ("libexecdir"), "octave",
|
||||
+ archprefix = fullfile (octave_config_info ("libdir"), "octave",
|
||||
"packages", cstrcat(desc.name, "-", desc.version));
|
||||
else
|
||||
archprefix = desc.dir;
|
||||
|
|
@ -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
|
||||
51
octave.spec
51
octave.spec
|
|
@ -1,25 +1,20 @@
|
|||
# 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: 8%{?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
|
||||
# Fix Fl_File_Chooser.H file location
|
||||
# Fixed upstream https://savannah.gnu.org/bugs/?func=detailitem&item_id=32972
|
||||
Patch3: octave-3.4.0-fltk.patch
|
||||
URL: http://www.octave.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
|
|
@ -77,16 +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
|
||||
%patch3 -p1 -b .fltk
|
||||
# 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 {} \;
|
||||
|
|
@ -102,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}
|
||||
|
|
@ -192,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}
|
||||
|
|
@ -216,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
|
||||
|
|
@ -253,6 +244,9 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Aug 06 2011 Jussi Lehtola <jussilehtola@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)
|
||||
|
|
@ -269,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
|
||||
|
|
|
|||
Loading…
Reference in New Issue