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

Drop use of %buildarch in macros.octave (bugz#1733898)

Browse Source
This commit is contained in:
Orion Poplawski 2019-07-31 07:40:27 -06:00
parent ce1b1e3f1c
commit c32f37ff6c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
macros.octave
View File

@ -33,12 +33,6 @@
print(rpm.expand("octave -H -q --no-window-system --no-site-file --eval 'pkg build -verbose -nodeps %{_builddir}/%{buildsubdir}/build "..octpkg_tarfile).."'\\n") print(rpm.expand("octave -H -q --no-window-system --no-site-file --eval 'pkg build -verbose -nodeps %{_builddir}/%{buildsubdir}/build "..octpkg_tarfile).."'\\n")
-- Extract the source tarball for debuginfo generation -- Extract the source tarball for debuginfo generation
print(rpm.expand("tar xf "..octpkg_tarfile.." -C %{_builddir}/%{buildsubdir}/build\\n")) print(rpm.expand("tar xf "..octpkg_tarfile.." -C %{_builddir}/%{buildsubdir}/build\\n"))
-- Define %octave_tar_suffix for later use by install/check macros
if (rpm.expand("%{?buildarch}") ~= "noarch") then
rpm.define("octave_tar_suffix %{octave_host}-%{octave_api}")
else
rpm.define("octave_tar_suffix any-none")
end
} }
# Install a package. We use the octave pkg install command to install the # Install a package. We use the octave pkg install command to install the
@ -49,7 +43,7 @@
%octave_pkg_install \ %octave_pkg_install \
mkdir -p %{buildroot}%{octprefix} \ mkdir -p %{buildroot}%{octprefix} \
mkdir -p %{buildroot}%{octarchprefix} \ mkdir -p %{buildroot}%{octarchprefix} \
%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");unlink(pkg("local_list"));unlink(pkg("global_list")); \ %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",glob("%{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}-*.tar.gz"){1,1});unlink(pkg("local_list"));unlink(pkg("global_list")); \
if [ -e %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m ] \ if [ -e %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m ] \
then \ then \
mv %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m.orig \ mv %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m.orig \
@ -72,7 +66,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("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")); \ %octave_cmd pkg("prefix","%{buildroot}%{octprefix}","%{buildroot}%{octarchprefix}");pkg("local_list",fullfile("%{buildroot}%{octshareprefix}","octave_packages"));pkg("list");pkg("install","-verbose",glob("%{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}-*.tar.gz"){1,1});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

@ -22,7 +22,7 @@
Name: octave Name: octave
Epoch: 6 Epoch: 6
Version: 5.1.0 Version: 5.1.0
Release: 1%{?rcver:.rc%{rcver}}%{?dist}.1 Release: 2%{?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
@ -410,6 +410,9 @@ make check %{?el7:|| :}
%{_pkgdocdir}/refcard*.pdf %{_pkgdocdir}/refcard*.pdf
%changelog %changelog
* Wed Jul 31 2019 Orion Poplawski <orion@nwra.com> - 6:5.1.0-2
- Drop use of %%buildarch in macros.octave (bugz#1733898)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6:5.1.0-1.1 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6:5.1.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild