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/libglvnd.git#259a9360642165b462a98e2c741359b316e57e25

libglvnd.spec

@@ -1,13 +1,10 @@
 #global commit0 f92208be88dd06a70b6f79a1cb95571e2762a9ec
 #global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
-%if 0%{?el6}
-%global _without_mesa_glvnd_default 1
-%endif
 
 Name:           libglvnd
 Version:        1.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
 Epoch:          1
 Summary:        The GL Vendor-Neutral Dispatch library
@@ -19,6 +16,7 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Patch0:         libglvnd-python3.patch
 Patch1:         0001-glx-Add-another-fallback-library-name.patch
 
+BuildRequires: make
 BuildRequires:  libtool
 BuildRequires:  gcc
 BuildRequires:  python3-rpm-macros
@@ -28,25 +26,9 @@ BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  xorg-x11-server-Xvfb
 
-%if (0%{?rhel} && 0%{?rhel} <= 6)
-BuildRequires:  autoconf268
-%endif
-
 %{?_without_mesa_glvnd_default:
-%if (0%{?rhel} && 0%{?rhel} <= 6)
-
-%{?filter_setup:
-%filter_provides_in %{_libdir}/%{name}
-%filter_requires_in %{_libdir}/%{name}
-%filter_setup
-}
-
-%else
-
 %global __provides_exclude_from %{_libdir}/%{name}
 %global __requires_exclude_from %{_libdir}/%{name}
-
-%endif
 }
 
 %description
@@ -144,11 +126,7 @@ libGL and libGLX are the common dispatch interface for the GLX API.
 
 %prep
 %autosetup -p1 -n %{name}-%{?commit0}%{?!commit0:%{version}}
-%if 0%{?rhel} == 6
-autoreconf268 -vif
-%else
 autoreconf -vif
-%endif
 
 %build
 export PYTHON=%{__python3}
@@ -264,6 +242,9 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
 
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild