Fix merge conflict
This commit is contained in:
commit
c31b075d79
10
dcraw.spec
10
dcraw.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: Tool for decoding raw image data from digital cameras
|
Summary: Tool for decoding raw image data from digital cameras
|
||||||
Name: dcraw
|
Name: dcraw
|
||||||
Version: 9.28.0
|
Version: 9.28.0
|
||||||
Release: 2%{?dist}
|
Release: 4%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://cybercom.net/~dcoffin/dcraw
|
URL: http://cybercom.net/~dcoffin/dcraw
|
||||||
Source0: http://cybercom.net/~dcoffin/dcraw/archive/dcraw-%{version}.tar.gz
|
Source0: http://cybercom.net/~dcoffin/dcraw/archive/dcraw-%{version}.tar.gz
|
||||||
@ -67,10 +67,16 @@ done
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jul 11 2018 Josef Ridky <jridky@redhat.com> - 9.28.0-2
|
* Thu Feb 21 2019 Josef Ridky <jridky@redhat.com> - 9.28.0-4
|
||||||
- Fix CVE-2017-13735 (#1488932)
|
- Fix CVE-2017-13735 (#1488932)
|
||||||
- Fix CVE-2017-14608 (#1499687)
|
- Fix CVE-2017-14608 (#1499687)
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.28.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.28.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Thu Jun 14 2018 Josef Ridky <jridky@redhat.com> - 9.28.0-1
|
* Thu Jun 14 2018 Josef Ridky <jridky@redhat.com> - 9.28.0-1
|
||||||
- New upstream release 9.28.0 (#1585348)
|
- New upstream release 9.28.0 (#1585348)
|
||||||
- Fix CVE-2018-5801 (#1557160)
|
- Fix CVE-2018-5801 (#1557160)
|
||||||
|
Loading…
Reference in New Issue
Block a user