From 41474056fc5aff7f99cfa568420cc4455d696682 Mon Sep 17 00:00:00 2001
From: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
Date: Mon, 18 May 2020 19:00:29 +0200
Subject: [PATCH] libglvnd update build specs

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
---
 SPECS/libglvnd.spec | 57 ++++++++++-----------------------------------
 1 file changed, 12 insertions(+), 45 deletions(-)

diff --git a/SPECS/libglvnd.spec b/SPECS/libglvnd.spec
index 62f3d31..2ee23e9 100644
--- a/SPECS/libglvnd.spec
+++ b/SPECS/libglvnd.spec
@@ -1,9 +1,6 @@
 #global commit0 f92208be88dd06a70b6f79a1cb95571e2762a9ec
 #global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%global _without_mesa_glvnd_default 1
-%endif
+%global _without_mesa_glvnd_default 0
 
 Name:           libglvnd
 Version:        1.3.1
@@ -28,26 +25,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
 libglvnd is an implementation of the vendor-neutral dispatch layer for
@@ -65,9 +45,9 @@ Requires:       %{name}-core-devel%{?_isa} = %{epoch}:%{version}-%{release}
 # Required by any glx.h users.
 Requires:       libX11-devel%{?_isa}
 # We might split into more sub-packages
-Obsoletes:      mesa-libGLES-devel < 19.3.0~rc1
-Provides:       mesa-libGLES-devel
-Provides:       mesa-libGLES-devel%{?_isa}
+#Obsoletes:      mesa-libGLES-devel < 19.3.0~rc1
+#Provides:       mesa-libGLES-devel
+#Provides:       mesa-libGLES-devel%{?_isa}
 Obsoletes:      mesa-khr-devel < 19.3.0~rc1
 Provides:       mesa-khr-devel
 Provides:       mesa-khr-devel%{?_isa}
@@ -142,11 +122,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}
@@ -165,14 +141,14 @@ export PYTHON=%{__python3}
 %make_install INSTALL="install -p"
 find %{buildroot} -name '*.la' -delete
 
-%{?_without_mesa_glvnd_default:
-# Avoid conflict with mesa-libGL
-mkdir -p %{buildroot}%{_libdir}/%{name}/
-for l in libEGL libGL libGLESv1_CM libGLESv2 libGLX; do
-  mv %{buildroot}%{_libdir}/${l}.so* \
-    %{buildroot}%{_libdir}/%{name}/
-done
-}
+#%{?_without_mesa_glvnd_default:
+## Avoid conflict with mesa-libGL
+#mkdir -p %{buildroot}%{_libdir}/%{name}/
+#for l in libEGL libGL libGLESv1_CM libGLESv2 libGLX; do
+#  mv %{buildroot}%{_libdir}/${l}.so* \
+#    %{buildroot}%{_libdir}/%{name}/
+#done
+#}
 
 # Create directory layout
 mkdir -p %{buildroot}%{_sysconfdir}/glvnd/egl_vendor.d/
@@ -181,15 +157,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/egl/egl_external_platform.d/
 mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
 
 
-%check
-export DO_X11_TESTS=1
-xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
-%ifarch s390x ppc64
-    :
-%else
-    (cat `find . -name test-suite.log` ; exit 1)
-%endif
-
 %pre -p /sbin/ldconfig
 %post -p /sbin/ldconfig