rpms/octave/FC-4 octave-2.9.6-parse.patch, NONE, 1.1 octave-2.9.6-path.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 octave.spec, 1.29, 1.30 sources, 1.7, 1.8 octave-2.9.5-config.patch, 1.1, NONE octave-2.9.5-lex.patch, 1.1, NONE octave-2.9.5-sparse.patch, 1.1, NONE
Quentin Spencer (qspencer)
fedora-extras-commits at redhat.com
Thu Jul 13 19:12:34 UTC 2006
- Previous message (by thread): rpms/python-cherrypy/devel python-cherrypy.spec,1.8,1.9
- Next message (by thread): rpms/octave-forge/FC-5 octave-forge-2006.07.09-legend.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 octave-forge.spec, 1.24, 1.25 sources, 1.8, 1.9 octave-forge-2006.03.17-octcdf.patch, 1.1, NONE octave-forge-2006.03.17-zplane.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: qspencer
Update of /cvs/extras/rpms/octave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7465
Modified Files:
.cvsignore octave.spec sources
Added Files:
octave-2.9.6-parse.patch octave-2.9.6-path.patch
Removed Files:
octave-2.9.5-config.patch octave-2.9.5-lex.patch
octave-2.9.5-sparse.patch
Log Message:
New upstream release. New patches. Misc spec file changes--see changelog.
octave-2.9.6-parse.patch:
--- NEW FILE octave-2.9.6-parse.patch ---
src/ChangeLog:
2006-07-02 John W. Eaton <jwe at octave.org>
* ov-str-mat.cc (CHAR_MATRIX_CONV): Omit "warn-" from label.
* parse.y (maybe_warn_variable_switch_label): Likewise.
Index: src/ov-str-mat.cc
===================================================================
RCS file: /cvs/octave/src/ov-str-mat.cc,v
retrieving revision 1.62
diff -u -u -r1.62 ov-str-mat.cc
--- src/ov-str-mat.cc 23 May 2006 06:05:14 -0000 1.62
+++ src/ov-str-mat.cc 2 Jul 2006 17:44:21 -0000
@@ -176,7 +176,7 @@
gripe_invalid_conversion ("string", TNAME); \
else \
{ \
- warning_with_id ("Octave:warn-str-to-num", \
+ warning_with_id ("Octave:str-to-num", \
"implicit conversion from %s to %s", \
"string", TNAME); \
\
Index: src/parse.y
===================================================================
RCS file: /cvs/octave/src/parse.y,v
retrieving revision 1.264
diff -u -u -r1.264 parse.y
--- src/parse.y 1 Jul 2006 15:24:44 -0000 1.264
+++ src/parse.y 2 Jul 2006 17:44:21 -0000
@@ -1533,7 +1533,7 @@
maybe_warn_variable_switch_label (tree_expression *expr)
{
if (! expr->is_constant ())
- warning_with_id ("Octave:warn-variable-switch-label",
+ warning_with_id ("Octave:variable-switch-label",
"variable switch label");
}
octave-2.9.6-path.patch:
--- NEW FILE octave-2.9.6-path.patch ---
liboctave/ChangeLog:
2006-06-30 John W. Eaton <jwe at octave.org>
* dir-ops.cc (dir_entry::open): Perform tilde expansion here.
* file-stat.cc (stat::update_internal): Ditto.
src/ChangeLog:
2006-06-30 John W. Eaton <jwe at octave.org>
* load-path.cc (genpath): Don't perform tilde expansion on name.
(load_path::do_add): Don't warn about moving "." to front of list.
Index: liboctave/dir-ops.cc
===================================================================
RCS file: /cvs/octave/liboctave/dir-ops.cc,v
retrieving revision 1.8
diff -u -u -r1.8 dir-ops.cc
--- liboctave/dir-ops.cc 26 Apr 2005 19:24:28 -0000 1.8
+++ liboctave/dir-ops.cc 30 Jun 2006 16:45:59 -0000
@@ -32,6 +32,7 @@
#include "sysdir.h"
#include "dir-ops.h"
+#include "file-ops.h"
#include "lo-error.h"
#include "lo-sysdep.h"
#include "str-vec.h"
@@ -47,8 +48,10 @@
if (! name.empty ())
{
close ();
+
+ std::string fullname = file_ops::tilde_expand (name);
- dir = static_cast<void *> (opendir (name.c_str ()));
+ dir = static_cast<void *> (opendir (fullname.c_str ()));
if (dir)
fail = false;
Index: liboctave/file-stat.cc
===================================================================
RCS file: /cvs/octave/liboctave/file-stat.cc,v
retrieving revision 1.8
diff -u -u -r1.8 file-stat.cc
--- liboctave/file-stat.cc 24 Apr 2006 19:13:07 -0000 1.8
+++ liboctave/file-stat.cc 30 Jun 2006 16:45:59 -0000
@@ -35,6 +35,7 @@
#include <unistd.h>
#endif
+#include "file-ops.h"
#include "file-stat.h"
#include "statdefs.h"
@@ -196,8 +197,10 @@
{
initialized = false;
fail = false;
+
+ std::string full_file_name = file_ops::tilde_expand (file_name);
- const char *cname = file_name.c_str ();
+ const char *cname = full_file_name.c_str ();
struct stat buf;
Index: src/load-path.cc
===================================================================
RCS file: /cvs/octave/src/load-path.cc,v
retrieving revision 1.4
diff -u -u -r1.4 load-path.cc
--- src/load-path.cc 28 Jun 2006 22:11:51 -0000 1.4
+++ src/load-path.cc 30 Jun 2006 16:46:03 -0000
@@ -1140,9 +1135,7 @@
{
std::string retval;
- std::string full_dirname = file_ops::tilde_expand (dirname);
-
- dir_entry dir (full_dirname);
+ dir_entry dir (dirname);
if (dir)
{
@@ -1172,7 +1165,7 @@
if (! skip_p)
{
- std::string nm = full_dirname + file_ops::dir_sep_str + elt;
+ std::string nm = dirname + file_ops::dir_sep_str + elt;
file_stat fs (nm);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 12 May 2006 17:49:30 -0000 1.7
+++ .cvsignore 13 Jul 2006 19:12:34 -0000 1.8
@@ -1 +1 @@
-octave-2.9.5.tar.bz2
+octave-2.9.6.tar.bz2
Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- octave.spec 12 May 2006 17:49:30 -0000 1.29
+++ octave.spec 13 Jul 2006 19:12:34 -0000 1.30
@@ -1,5 +1,5 @@
Name: octave
-Version: 2.9.5
+Version: 2.9.6
Release: 1%{?dist}
Summary: A high-level language for numerical computations
Epoch: 6
@@ -7,9 +7,8 @@
Group: Applications/Engineering
License: GPL
Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
-Patch0: octave-2.9.5-sparse.patch
-Patch1: octave-2.9.5-config.patch
-Patch2: octave-2.9.5-lex.patch
+Patch0: octave-2.9.6-parse.patch
+Patch1: octave-2.9.6-path.patch
URL: http://www.octave.org
Requires: gnuplot less info texinfo
Requires(post): /sbin/install-info
@@ -18,7 +17,7 @@
Requires(preun): /sbin/install-info
BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel
BuildRequires: ncurses-devel zlib-devel libtermcap-devel hdf5-devel
-BuildRequires: readline-devel glibc-devel fftw-devel autoconf gperf
+BuildRequires: readline-devel glibc-devel fftw-devel gperf
BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +42,7 @@
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: readline-devel fftw-devel hdf5-devel zlib-devel
-Requires: lapack-devel blas-devel gcc-c++
+Requires: lapack-devel blas-devel gcc-c++ gcc-gfortran
%description devel
The octave-devel package contains files needed for developing
@@ -54,15 +53,10 @@
%setup -q
%patch0 -p0
%patch1 -p0
-%patch2 -p0
%build
-%ifarch x86_64
-%define enable64 yes
-%else
%define enable64 no
-%endif
export CPPFLAGS=-I%{_includedir}/glpk
%configure --enable-shared --disable-static --enable-64=%enable64
make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}"
@@ -99,8 +93,8 @@
%post
/sbin/ldconfig
-/sbin/install-info --info-dir=%{_infodir} --section="Programming:" \
- --entry="* Octave:(%{name}). %{summary}." %{_infodir}/octave.info.gz
+/sbin/install-info --info-dir=%{_infodir} --section="Programming" \
+ %{_infodir}/octave.info.gz
%preun
if [ "$1" = "0" ]; then
@@ -115,8 +109,7 @@
%doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP
%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p*
%doc doc/faq doc/interpreter/HTML doc/refcard
-%{_bindir}/octave
-%{_bindir}/octave-%{version}
+%{_bindir}/octave*
%config(noreplace) /etc/ld.so.conf.d/*
%{_libdir}/octave*
%{_datadir}/octave
@@ -129,13 +122,18 @@
%defattr(-,root,root)
%doc doc/liboctave
%{_bindir}/mkoctfile*
-%{_bindir}/octave-bug*
-%{_bindir}/octave-config*
-%{_includedir}/octave*
+%{_includedir}/octave-%{version}
%{_mandir}/man*/mkoctfile*
%changelog
+* Thu Jul 13 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.6-1
+- New upstream release. Remove old patches and add two new ones.
+- Disable 64-bit extensions (some libraries don't support 64-bit indexing yet).
+- Add gcc-gfortran to -devel dependencies (mkoctfile fails without it).
+- Move octave-bug and octave-config from devel to main package.
+- Fix categorization of info files (bug 196760).
+
* Fri May 12 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
- Upgrade to 2.9.x releases (in response to bug #190646).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 12 May 2006 17:49:30 -0000 1.7
+++ sources 13 Jul 2006 19:12:34 -0000 1.8
@@ -1 +1 @@
-09eff7b2319383778db7bb5e50619bf9 octave-2.9.5.tar.bz2
+10f07dbc0951a7318502a9f1e51e6388 octave-2.9.6.tar.bz2
--- octave-2.9.5-config.patch DELETED ---
--- octave-2.9.5-lex.patch DELETED ---
--- octave-2.9.5-sparse.patch DELETED ---
- Previous message (by thread): rpms/python-cherrypy/devel python-cherrypy.spec,1.8,1.9
- Next message (by thread): rpms/octave-forge/FC-5 octave-forge-2006.07.09-legend.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 octave-forge.spec, 1.24, 1.25 sources, 1.8, 1.9 octave-forge-2006.03.17-octcdf.patch, 1.1, NONE octave-forge-2006.03.17-zplane.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list