rpms/octave
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

macros: support dependencies in octave_pkg_check

Browse Source
This commit is contained in:
Colin B. Macdonald 2017-11-11 08:00:15 -08:00
parent 4ca05c4c51
commit eb697c174d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macros.octave
View File

@ -70,7 +70,7 @@ fi \
# octave can find the package, then remove 'octave_packages' again, and re-strip # octave can find the package, then remove 'octave_packages' again, and re-strip
# any shared objects. # any shared objects.
%octave_pkg_check \ %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} \ /usr/lib/rpm/brp-strip-shared %{__strip} \
%{nil} %{nil}

5
octave.spec
View File

@ -21,7 +21,7 @@
Name: octave Name: octave
Epoch: 6 Epoch: 6
Version: 4.2.2 Version: 4.2.2
Release: 4%{?rcver:.rc%{rcver}}%{?dist} Release: 5%{?rcver:.rc%{rcver}}%{?dist}
Summary: A high-level language for numerical computations Summary: A high-level language for numerical computations
License: GPLv3+ License: GPLv3+
URL: http://www.octave.org URL: http://www.octave.org
@ -445,6 +445,9 @@ fi
%{_pkgdocdir}/refcard*.pdf %{_pkgdocdir}/refcard*.pdf
%changelog %changelog
* Thu Jun 28 2018 Colin B. Macdonald <cbm@m.fsf.org> - 6:4.2.2-5
- macros: support dependencies in octave_pkg_check
* Thu Jun 21 2018 Orion Poplawski <orion@nwra.com> - 6:4.2.2-4 * Thu Jun 21 2018 Orion Poplawski <orion@nwra.com> - 6:4.2.2-4
- Add patch to fix crash with Ctrl-D (bug #1589460) - Add patch to fix crash with Ctrl-D (bug #1589460)