Fix merge conflict
This commit is contained in:
commit
56f26ca8d9
@ -6,7 +6,7 @@
|
||||
Summary: Implementation of the JPEG-2000 standard, Part 1
|
||||
Name: jasper
|
||||
Version: 2.0.24
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
|
||||
License: JasPer
|
||||
URL: http://www.ece.uvic.ca/~frodo/jasper/
|
||||
@ -130,9 +130,12 @@ make test -C builder
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 28 2021 Josef Ridky <jridky@redhat.com> - 2.0.24-2
|
||||
* Thu Jan 28 2021 Josef Ridky <jridky@redhat.com> - 2.0.24-3
|
||||
- fix CVE-2021-3272 (#1921328)
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.24-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jan 25 2021 Josef Ridky <jridky@redhat.com> - 2.0.24-1
|
||||
- New upstream release 2.0.24 (#1905690)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user