diff --git a/macros.octave b/macros.octave index c6c0a71..5504880 100644 --- a/macros.octave +++ b/macros.octave @@ -52,15 +52,17 @@ 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")); \ if [ -e %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m ] \ 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 \ fi \ echo "function on_uninstall (desc)" > %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m \ echo " error ('Can not uninstall %s installed by the redhat package manager', desc.name);" >> %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m \ echo "endfunction" >> %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m \ if [ -e %{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}/octave-%{octpkg}.metainfo.xml ] \ then \ + echo "Found octave-%{octpkg}.metainfo.xml" \ mkdir -p %{buildroot}/%{_datadir}/appdata \ cp -p %{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}/octave-%{octpkg}.metainfo.xml %{buildroot}/%{_datadir}/appdata/ \ + appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/octave-%{octpkg}.metainfo.xml \ fi \ %{nil} diff --git a/octave.spec b/octave.spec index e3bdb4c..0d2e8bb 100644 --- a/octave.spec +++ b/octave.spec @@ -21,7 +21,7 @@ Name: octave Epoch: 6 Version: 4.2.1 -Release: 4%{?rcver:.rc%{rcver}}%{?dist} +Release: 4%{?rcver:.rc%{rcver}}%{?dist}.1 Summary: A high-level language for numerical computations Group: Applications/Engineering License: GPLv3+ @@ -447,6 +447,9 @@ fi %{_pkgdocdir}/refcard*.pdf %changelog +* Sat Aug 12 2017 Orion Poplawski - 6:4.2.1-4.1 +- Run appstream-util validate-relax on metainfo.xml files + * Fri Aug 11 2017 Orion Poplawski - 6:4.2.1-4 - Use openblas on Fedora 27+