Solve merge conflict

net-snmp.spec

@@ -10,7 +10,7 @@
 Summary:    A collection of SNMP protocol tools and libraries
 Name:       net-snmp
 Version:    5.8
-Release:    9%{?dist}
+Release:    10%{?dist}
 Epoch:      1
 
 License:    BSD
@@ -42,6 +42,7 @@ Patch12:    net-snmp-5.8-autofs-skip.patch
 Patch13:    net-snmp-5.8-key-leak-backport.patch
 Patch14:    net-snmp-5.8-python-ld-flags.patch
 Patch15:    net-snmp-5.8-ipv6-clientaddr.patch
+Patch16:    net-snmp-5.8-licensing.patch
 
 # Modern RPM API means at least EL6
 Patch101:   net-snmp-5.8-modern-rpm-api.patch
@@ -211,6 +212,7 @@ cp %{SOURCE10} .
 %patch13 -p1 -b .leak-backport
 %patch14 -p1 -b .python-ld-flags
 %patch15 -p1 -b .ipv6-clientaddr
+%patch16 -p1
 
 %patch101 -p1 -b .modern-rpm-api
 %patch102 -p1
@@ -481,6 +483,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
 %{_libdir}/libnetsnmptrapd*.so.%{soname}*
 
 %changelog
+* Fri Jun 28 2019 Josef Ridky <jridky@redhat.com> - 1:5.8-10
+- remove file with unsupported license
+
 * Mon Jun 10 22:13:21 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:5.8-9
 - Rebuild for RPM 4.15