Solve merge conflict

net-snmp.spec

@@ -45,7 +45,6 @@ Patch102:   net-snmp-5.8-python3.patch
 
 Requires:        %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:        %{name}-agent-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires:        gcc
 # This is actually needed for the %%triggerun script but Requires(triggerun)
 # is not valid.  We can use %%post because this particular %triggerun script
 # should fire just after this package is installed.
@@ -82,7 +81,6 @@ which contains NET-SNMP utilities.
 %package utils
 Summary:  Network management utilities using SNMP, from the NET-SNMP project
 Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: gcc
 
 %description utils
 The net-snmp-utils package contains various utilities for use with the
@@ -101,7 +99,7 @@ Requires: elfutils-devel, rpm-devel, elfutils-libelf-devel, openssl-devel
 Requires: lm_sensors-devel
 %endif
 # pull perl development libraries, net-snmp agent libraries may link to them
-Requires: perl-devel%{?_isa}, gcc
+Requires: perl-devel%{?_isa}
 
 %description devel
 The net-snmp-devel package contains the development libraries and
@@ -478,6 +476,12 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
 - remove APSL downstream patch due this copyright is already 
   coveret by part 8 in COPYING file
 
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.7.3-42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jul 07 2018 Miro Hrončok <mhroncok@redhat.com> - 1:5.7.3-41
+- Rebuilt for Python 3.7
+
 * Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:5.7.3-40
 - Perl 5.28 rebuild