!28 fix several issues

From: @zhangruifang2020 
Reviewed-by: @licihua, @caodongxia 
Signed-off-by: @licihua, @caodongxia
This commit is contained in:
openeuler-ci-bot 2022-10-31 06:41:13 +00:00 committed by Gitee
commit 74d665d614
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -8,7 +8,7 @@
Name: nasm
Version: 2.15.05
Release: 2
Release: 3
Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
License: BSD
URL: http://www.nasm.us
@ -21,7 +21,7 @@ Patch6000: enable-make-check.patch
BuildRequires: perl(Env) autoconf asciidoc xmlto gcc make git
Provides: %{name}-rdoff
Obsoletes: %{name}-rdoff
Obsoletes: %{name}-rdoff < %{version}-%{release}
%description
NASM is the Netwide Assembler, a free portable assembler for the Intel
@ -37,7 +37,7 @@ BuildRequires: perl(Sort::Versions)
BuildRequires: adobe-source-sans-pro-fonts adobe-source-code-pro-fonts
BuildRequires: ghostscript
Provides: %{name}-doc
Obsoletes: %{name}-doc
Obsoletes: %{name}-doc < %{version}-%{release}
%endif
BuildArch: noarch
@ -89,13 +89,17 @@ make test
%{_mandir}/man1/ld*
%changelog
* Sat Oct 22 2022 zhangruifang <zhangruifang1@h-partners.com> - 2.15.05-3
- add version number for Obsoletes
- fix bogus date in changelog
* Sat Nov 27 2021 ExtinctFire <shenyining_00@126.com> - 2.15.05-2
- enable make check
* Thu Jan 28 2021 liudabo <liudabo1@huawei.com> - 2.15.05-1
- upgrade version to 2.15.05
* Thu Jan 07 2020 shixuantong <shixuantong@huawei.com> - 2.15.03-2
* Thu Jan 07 2021 shixuantong <shixuantong@huawei.com> - 2.15.03-2
- fix CVE-2019-20352 CVE-2020-24241
* Thu Jul 23 2020 shixuantong <shixuantong@huawei.com> - 2.15.03-1