Compare commits

...

23 Commits
master ... el6

Author SHA1 Message Date
Rex Dieter e1b7d1b835 ExclusiveArch: %%ix86 x86_64 (#1224483) 2016-02-12 07:09:14 -06:00
Rex Dieter e2d9dc8519 rebuild (GraphicsMagick) 2016-02-08 12:20:53 -06:00
Orion Poplawski 78fadf8a8c Merge branch 'el6' of ssh://pkgs.fedoraproject.org/octave into el6 2013-02-24 14:31:52 -07:00
Orion Poplawski 92c0ebd6f8 Update macros.octave from master - fix %octave_api and add --no-window-system to %octave_cmd 2013-02-24 14:31:40 -07:00
Orion Poplawski 9d8976875c Cleanup merge from f16 3.4.3 2012-06-04 15:52:57 -06:00
Orion Poplawski e575215ce3 Merge from devel - 3.4.3 2011-10-31 16:49:00 -06:00
Jussi Lehtola 66d96dfbb1 Import patches from rawhide. 2011-08-12 15:56:04 +03:00
Jussi Lehtola 2b085afb7b Import patches from rawhide. 2011-08-12 15:55:32 +03:00
Jussi Lehtola d360bab158 Disable SMP build for now. 2011-08-06 15:21:23 +03:00
Jussi Lehtola d324a130c9 Update to 3.4.2. 2011-08-06 13:45:37 +03:00
Jussi Lehtola da03b090e0 Update to 3.4.2. 2011-08-06 13:15:11 +03:00
Orion Poplawski 5eb699ed28 Fix merge conflicts 2011-05-18 20:34:38 -06:00
Orion Poplawski 6f1f7e3ce8 Merge from master - 3.4.0 2011-05-18 19:44:46 -06:00
Orion Poplawski 100e736a69 Update .gitignore for 3.2.4 2010-08-13 09:15:26 -06:00
Fedora Release Engineering 561117a326 dist-git conversion 2010-07-29 04:49:58 +00:00
Jussi Lehtola 13a65f6913 Sync from rawhide branch. 2010-07-08 08:58:16 +00:00
Dennis Gilmore ec79c6609d Initialize branch EL-6 for octave 2010-05-08 02:02:09 +00:00
Jussi Lehtola 515cc00d5f Fix build against ARPACK. 2010-01-17 11:24:13 +00:00
Jussi Lehtola 0fc90a137d Really build against ATLAS instead of reference BLAS. 2010-01-06 10:38:18 +00:00
Bill Nottingham 9f621bf585 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:22:02 +00:00
alexlan e25e7d3176 Bump to 2.fc12.1 because 2.fc12 erroneously applied to rawhide branch 2009-11-15 09:24:39 +00:00
alexlan 47113bb375 - Workaround broken pre-linking (#524493) 2009-11-15 09:18:05 +00:00
Orion Poplawski bd5c03dbdd Update to 3.2.3 from devel 2009-10-12 19:27:34 +00:00
3 changed files with 12 additions and 8 deletions

2
.gitignore vendored
View File

@ -1,5 +1,3 @@
octave-3.2.4.tar.bz2
/octave-3.3.54.tar.bz2
/octave-3.4.0.tar.bz2
/octave-3.4.2.tar.bz2
/octave-3.4.3.tar.bz2

View File

@ -1,7 +1,7 @@
# Octave packaging macros
# Octave binary API provided
%octave_api %(octave-config -p API_VERSION || echo 0)}
%octave_api %(octave-config -p API_VERSION || echo 0)
# Octave Package Directories
%octshareprefix %{_datadir}/octave
@ -11,7 +11,7 @@
%octpkglibdir %{octarchprefix}/%{octpkg}-%{version}
# Run an octave command - quietly with no startup files
%octave_cmd() octave -H -q --no-site-file --eval "%*";
%octave_cmd() octave -H -q --no-window-system --no-site-file --eval "%*";
# Build Source0 into a package tar file in a temporary location
%octave_pkg_build %octave_cmd pkg build '-verbose' %{_tmppath}/%{name}-%{version}-%{release}.%{_arch} %{_builddir}/%{buildsubdir}

View File

@ -3,7 +3,7 @@
Name: octave
Version: 3.4.3
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A high-level language for numerical computations
Epoch: 6
Group: Applications/Engineering
@ -16,6 +16,10 @@ Patch2: octave-3.4.0-pkgbuilddir.patch
URL: http://www.octave.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# suitesparse is currently only available for ix86 and x86_64
# https://bugzilla.redhat.com/show_bug.cgi?id=1224483
ExclusiveArch: %{ix86} x86_64
Provides: octave(api) = %{octave_api}
BuildRequires: bison flex less tetex gcc-gfortran atlas-devel
@ -242,11 +246,13 @@ fi
%changelog
* Mon Oct 24 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.3-1
* Mon Feb 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:3.4.3-2
- rebuild (GraphicsMagick)
- ExclusiveArch: %%ix86 x86_64 (#1224483)
* Mon Jun 4 2012 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.3-1
- Update to 3.4.3
- Drop upstreamed patches
* Wed Aug 24 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 6:3.4.2-3
- Place rpm macros in -devel.
* Thu Aug 11 2011 Orion Poplawski <orion[AT]cora.nwra com> - 6:3.4.2-2