From 1dc1319977c160748ff56206755328ef6ee16092 Mon Sep 17 00:00:00 2001 From: Rakesh Pandit Date: Oct 23 2008 10:14:27 +0000 Subject: patched for sh arch --- diff --git a/.cvsignore b/.cvsignore index 13221e9..14c78e2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -octave-3.0.1.tar.bz2 +octave-3.0.2.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..6ab2760 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +octave-3_0_2-2_fc10:F-8:octave-3.0.2-2.fc10.src.rpm:1224776392 diff --git a/octave-sh-arch.patch b/octave-sh-arch.patch new file mode 100644 index 0000000..e930538 --- /dev/null +++ b/octave-sh-arch.patch @@ -0,0 +1,12 @@ +diff -u octave-3.0.2.org/configure octave-3.0.2/configure +--- octave-3.0.2.org/configure 2008-10-23 20:03:19.000000000 +0530 ++++ octave-3.0.2/configure 2008-10-23 20:03:44.000000000 +0530 +@@ -11078,7 +11078,7 @@ + + ;; + # Ignore these flags. +- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) ++ -little| -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*) + ;; + -lkernel32) + test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" diff --git a/octave.spec b/octave.spec index 96403f3..d5add6b 100644 --- a/octave.spec +++ b/octave.spec @@ -2,14 +2,15 @@ %define octave_api api-v32 Name: octave -Version: 3.0.1 -Release: 1%{?dist} +Version: 3.0.2 +Release: 2%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPLv3+ Source: ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2 +Patch1: octave-sh-arch.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -19,8 +20,8 @@ Requires(preun): /sbin/install-info BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildRequires: ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel BuildRequires: readline-devel glibc-devel fftw-devel gperf ghostscript -BuildRequires: suitesparse-devel glpk-devel gnuplot desktop-file-utils BuildRequires: curl-devel pcre-devel +BuildRequires: suitesparse-devel glpk-devel gnuplot desktop-file-utils Provides: octave(api) = %{octave_api} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,9 +62,12 @@ then exit 1 fi +# patch for sh arch +%patch1 -p1 -b .sh-arch %build %define enable64 no +export CPPFLAGS="-DH5_USE_16_API" %configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran make %{?_smp_mflags} OCTAVE_RELEASE="Fedora %{version}-%{release}" @@ -140,18 +144,45 @@ fi %changelog -* Tue Apr 22 2008 Quentin Spencer 3.0.1-1 -- New release of octave. +* Thu Oct 23 2008 Rakesh Pandit 3.0.2-2 +- patch for sh arch: it adds '-little' flag + +* Mon Sep 8 2008 Orion Poplawski 3.0.2-1 +- Update to 3.0.2 + +* Mon Apr 21 2008 Quentin Spencer 3.0.1-1 +- New release of octave. Remove gcc 4.3 patch. + +* Mon Mar 3 2008 Alex Lancaster - 6:3.0.0-6 +- Re-enable patch, but change cstring -> string.h so it works for C as + well as C++. Hopefully this will #435600 for real. + +* Sun Mar 2 2008 Alex Lancaster - 6:3.0.0-5 +- Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and + may not be necessary (#435600) + +* Fri Feb 29 2008 Orion Poplawski 3.0.0-4 +- Rebuild for hdf5 1.8.0 using compatability API define +- Add gcc43 patch + +* Tue Feb 19 2008 Fedora Release Engineering - 6:3.0.0-3 +- Autorebuild for GCC 4.3 * Wed Jan 9 2008 Quentin Spencer 3.0.0-2 - Add curl-devel and pcre-devel as build dependencies. Closes bug 302231. -* Wed Dec 26 2007 Quentin Spencer 3.0.0-1 +* Fri Dec 21 2007 Quentin Spencer 3.0.0-1 - Update to 3.0.0. -* Thu Dec 13 2007 Quentin Spencer 2.9.19-1 +* Wed Dec 12 2007 Quentin Spencer 2.9.19-1 - Update to 2.9.19 and update octave_api. +* Wed Dec 5 2007 Quentin Spencer 2.9.18-1 +- Update to 2.9.18 and update octave_api. + +* Wed Nov 28 2007 Quentin Spencer 2.9.17-1 +- Update to 2.9.17 and update octave_api. + * Mon Nov 5 2007 Quentin Spencer 2.9.16-1 - Update to 2.9.16, remove old patch. - Update licencse from GPLv2+ to GPLv3+. diff --git a/sources b/sources index 48143c7..1d22da5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -230f3895a42386ec625bf2593a44c441 octave-3.0.1.tar.bz2 +931e28ab1181018c8079fb8138971ab0 octave-3.0.2.tar.bz2