Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/go-rpm-macros.git#8c70e912f48825f74b3612e6cadffd6f5d39b788

go-rpm-macros.spec

@@ -8,9 +8,6 @@ Version:   3.0.9
 
 # Master definition that will be written to macro files
 %global golang_arches   %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
-%if 0%{?rhel} >= 9
-%global golang_arches   x86_64 aarch64 ppc64le s390x
-%endif
 %global gccgo_arches    %{mips}
 # Go sources can contain arch-specific files and our macros will package the
 # correct files for each architecture. Therefore, move gopath to _libdir and
@@ -20,7 +17,7 @@ Version:   3.0.9
 ExclusiveArch: %{golang_arches} %{gccgo_arches}
 
 Name:      go-rpm-macros
-Release:   1.1%{?dist}
+Release:   2%{?dist}
 Summary:   Build-stage rpm automation for Go packages
 
 License:   GPLv3+
@@ -165,9 +162,8 @@ install -m 0644 -vp   rpm/macros.d/macros.go-compilers-gcc \
 %{_spectemplatedir}/*.spec
 
 %changelog
-* Tue Dec 01 2020 Petr Šabata <contyk@redhat.com> - 3.0.9-1.1
-- Drop 32bit arches in EL 9
-- Downstream only until uprstream PR#3 gets merged
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Thu Aug 13 2020 Neal Gompa <ngompa13@gmail.com> - 3.0.9-1
 - Update to 3.0.9