Update macros.octave from master - fix %octave_api and add --no-window-system to %octave_cmd

This commit is contained in:
Orion Poplawski 2013-02-24 14:31:40 -07:00
parent 5eb699ed28
commit 92c0ebd6f8

View File

@ -1,7 +1,7 @@
# Octave packaging macros # Octave packaging macros
# Octave binary API provided # 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 # Octave Package Directories
%octshareprefix %{_datadir}/octave %octshareprefix %{_datadir}/octave
@ -11,7 +11,7 @@
%octpkglibdir %{octarchprefix}/%{octpkg}-%{version} %octpkglibdir %{octarchprefix}/%{octpkg}-%{version}
# Run an octave command - quietly with no startup files # 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 # 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} %octave_pkg_build %octave_cmd pkg build '-verbose' %{_tmppath}/%{name}-%{version}-%{release}.%{_arch} %{_builddir}/%{buildsubdir}