From 2bee86eba74138ac0d9057ba7b2029213b41abf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Fri, 28 Jun 2019 08:23:17 +0200 Subject: [PATCH] Solve merge conflict --- net-snmp.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net-snmp.spec b/net-snmp.spec index d3c5606..4a4842f 100644 --- a/net-snmp.spec +++ b/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 - 1:5.8-10 +- remove file with unsupported license + * Mon Jun 10 22:13:21 CET 2019 Igor Gnatenko - 1:5.8-9 - Rebuild for RPM 4.15