rpms/octave/F-7 .cvsignore, 1.11, 1.12 octave.spec, 1.50, 1.51 sources, 1.11, 1.12
Quentin Spencer (qspencer)
fedora-extras-commits at redhat.com
Fri Nov 9 18:58:16 UTC 2007
Author: qspencer
Update of /cvs/extras/rpms/octave/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4439
Modified Files:
.cvsignore octave.spec sources
Log Message:
Update to 2.9.16 and port various changes from devel branch.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/F-7/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 3 Oct 2006 18:32:54 -0000 1.11
+++ .cvsignore 9 Nov 2007 18:57:39 -0000 1.12
@@ -1 +1 @@
-octave-2.9.9.tar.bz2
+octave-2.9.16.tar.bz2
Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/F-7/octave.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- octave.spec 20 Feb 2007 15:01:07 -0000 1.50
+++ octave.spec 9 Nov 2007 18:57:39 -0000 1.51
@@ -1,14 +1,14 @@
# From src/version.h:#define OCTAVE_API_VERSION
-%define octave_api api-v22
+%define octave_api api-v28
Name: octave
-Version: 2.9.9
-Release: 2%{?dist}
+Version: 2.9.16
+Release: 1%{?dist}
Summary: A high-level language for numerical computations
Epoch: 6
Group: Applications/Engineering
-License: GPL
+License: GPLv3+
Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
URL: http://www.octave.org
Requires: gnuplot less info texinfo
@@ -17,7 +17,7 @@
Requires(post): /sbin/ldconfig
Requires(preun): /sbin/install-info
BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel
-BuildRequires: ncurses-devel zlib-devel hdf5-devel
+BuildRequires: ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel
BuildRequires: readline-devel glibc-devel fftw-devel gperf ghostscript
BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils
Provides: octave(api) = %{octave_api}
@@ -63,8 +63,7 @@
%build
%define enable64 no
-export CPPFLAGS=-I%{_includedir}/glpk
-%configure --enable-shared --disable-static --enable-64=%enable64
+%configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran
make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}"
@@ -89,9 +88,15 @@
# Create desktop file
rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop
-desktop-file-install --vendor fedora --add-category X-Fedora \
+desktop-file-install --vendor fedora --add-category X-Fedora --remove-category Development \
--dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop
+# Create directories for add-on packages
+HOST_TYPE=`$RPM_BUILD_ROOT%{_bindir}/octave-config -p CANONICAL_HOST_TYPE`
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/%{octave_api}/$HOST_TYPE
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}/site/oct/$HOST_TYPE
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/packages
+touch $RPM_BUILD_ROOT%{_datadir}/%{name}/octave_packages
%clean
@@ -119,6 +124,7 @@
%config(noreplace) /etc/ld.so.conf.d/*
%{_libdir}/octave*
%{_datadir}/octave
+%ghost %{_datadir}/octave/octave_packages
%{_libexecdir}/octave
%{_mandir}/man*/octave*
%{_infodir}/octave.info*
@@ -133,6 +139,14 @@
%changelog
+* Mon Nov 5 2007 Quentin Spencer <qspencer at users.sf.net> 2.9.16-1
+- Update to version 2.9.16.
+- Update licencse from GPLv2+ to GPLv3+.
+- Add qhull-devel and texinfo as dependencies.
+- Detection of glpk no longer needs special CPPFLAGS.
+- Other changes from development branch, including new octave packages
+ directory and changes to desktop file install.
+
* Tue Feb 20 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.9-2
- Fix install-info bug (Bug 219404).
- Add dependency on octave API so that breakages will be detected. (Bug 224050).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/F-7/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 3 Oct 2006 18:32:54 -0000 1.11
+++ sources 9 Nov 2007 18:57:39 -0000 1.12
@@ -1 +1 @@
-a76a6d88f414285472896a63e4282b7f octave-2.9.9.tar.bz2
+a7cbe4d897dd6f8d6d4aaff413a9c490 octave-2.9.16.tar.bz2
More information about the scm-commits
mailing list