diff --git a/macros.octave b/macros.octave index 5504880..180cf70 100644 --- a/macros.octave +++ b/macros.octave @@ -70,7 +70,7 @@ fi \ # octave can find the package, then remove 'octave_packages' again, and re-strip # any shared objects. %octave_pkg_check \ -%octave_cmd pkg("prefix","%{buildroot}%{octprefix}","%{buildroot}%{octarchprefix}");pkg("global_list",fullfile("%{buildroot}%{octshareprefix}","octave_packages"));pkg("local_list",fullfile("%{buildroot}%{octshareprefix}","octave_packages"));pkg("install","-nodeps","-verbose","%{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}-%{octave_tar_suffix}.tar.gz");pkg("load","%{octpkg}");runtests("%{buildroot}%{octpkgdir}");unlink(pkg("local_list"));unlink(pkg("global_list")); \ +%octave_cmd pkg("prefix","%{buildroot}%{octprefix}","%{buildroot}%{octarchprefix}");pkg("local_list",fullfile("%{buildroot}%{octshareprefix}","octave_packages"));pkg("list");pkg("install","-verbose","%{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}-%{octave_tar_suffix}.tar.gz");pkg("load","%{octpkg}");pkg("list");runtests("%{buildroot}%{octpkgdir}");unlink(pkg("local_list")); \ /usr/lib/rpm/brp-strip-shared %{__strip} \ %{nil} diff --git a/octave.spec b/octave.spec index acb9dc5..8b0b2bd 100644 --- a/octave.spec +++ b/octave.spec @@ -21,7 +21,7 @@ Name: octave Epoch: 6 Version: 4.2.2 -Release: 4%{?rcver:.rc%{rcver}}%{?dist} +Release: 5%{?rcver:.rc%{rcver}}%{?dist} Summary: A high-level language for numerical computations License: GPLv3+ URL: http://www.octave.org @@ -445,6 +445,9 @@ fi %{_pkgdocdir}/refcard*.pdf %changelog +* Thu Jun 28 2018 Colin B. Macdonald - 6:4.2.2-5 +- macros: support dependencies in octave_pkg_check + * Thu Jun 21 2018 Orion Poplawski - 6:4.2.2-4 - Add patch to fix crash with Ctrl-D (bug #1589460)