Solve merge conflict
This commit is contained in:
commit
aff1706e3d
@ -10,7 +10,7 @@
|
|||||||
Summary: A collection of SNMP protocol tools and libraries
|
Summary: A collection of SNMP protocol tools and libraries
|
||||||
Name: net-snmp
|
Name: net-snmp
|
||||||
Version: 5.8
|
Version: 5.8
|
||||||
Release: 4%{?dist}
|
Release: 6%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -481,9 +481,15 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
|
|||||||
%{_libdir}/libnetsnmptrapd*.so.%{soname}*
|
%{_libdir}/libnetsnmptrapd*.so.%{soname}*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Feb 07 2019 Josef Ridky <jridky@redhat.com> - 1:5.8-4
|
* Thu Feb 07 2019 Josef Ridky <jridky@redhat.com> - 1:5.8-6
|
||||||
- fix IPv6 address assignment for clientaddr option (#1673272)
|
- fix IPv6 address assignment for clientaddr option (#1673272)
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.8-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1:5.8-4
|
||||||
|
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||||
|
|
||||||
* Tue Nov 27 2018 Josef Ridky <jridky@redhat.com> - 1:5.8-3
|
* Tue Nov 27 2018 Josef Ridky <jridky@redhat.com> - 1:5.8-3
|
||||||
- backport memory leak fixes from upstream
|
- backport memory leak fixes from upstream
|
||||||
- add fPIE to CFLAGS (#1543853)
|
- add fPIE to CFLAGS (#1543853)
|
||||||
|
Loading…
Reference in New Issue
Block a user