From 5de466bdd85fc5da3a56fa395864d45171dac905 Mon Sep 17 00:00:00 2001 From: orange-snn Date: Mon, 3 Aug 2020 18:43:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!7=20:?= =?UTF-8?q?=20add=20mesa-libGLES-devel'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libglvnd.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/libglvnd.spec b/libglvnd.spec index f2ad862..7db732d 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -1,6 +1,6 @@ Name: libglvnd Version: 1.3.2 -Release: 2 +Release: 1 Epoch: 1 Summary: The GL Vendor-Neutral Dispatch library License: MIT @@ -30,14 +30,14 @@ which vendor to dispatch each API call to at runtime. %package devel Summary: Development files for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Provides: libglvnd-core-devel = %{epoch}:%{version}-%{release} Obsoletes: libglvnd-core-devel < %{epoch}:%{version}-%{release} Requires: libX11-devel%{?_isa} -Obsoletes: mesa-libGLES-devel < %{epoch}:%{version}-%{release} +Obsoletes: mesa-libGLES-devel < 19.3.0~rc1 Provides: mesa-libGLES-devel = %{epoch}:%{version}-%{release} Provides: mesa-libGLES-devel%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: mesa-khr-devel < %{epoch}:%{version}-%{release} +Obsoletes: mesa-khr-devel < 19.3.0~rc1 Provides: mesa-khr-devel = %{epoch}:%{version}-%{release} Provides: mesa-khr-devel%{?_isa} = %{epoch}:%{version}-%{release} Provides: libGLES-devel = %{epoch}:%{version}-%{release} @@ -86,15 +86,12 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || (cat `find . -name test- %{_libdir}/lib*.so %{_libdir}/pkgconfig/libglvnd.pc %{_includedir}/glvnd/* -%{_includedir}/*G* -%{_includedir}/KHR -%{_libdir}/pkgconfig/g*.pc -%{_libdir}/pkgconfig/*gl.pc +%exclude %{_includedir}/*G* +%exclude %{_includedir}/KHR +%exclude %{_libdir}/pkgconfig/g*.pc +%exclude %{_libdir}/pkgconfig/*gl.pc %changelog -* Mon Aug 03 2020 orange-snn - 1:1.3.2-2 -- add mesa-libGLES-devel - * Wed Jul 29 2020 openEuler Buildteam - 1:1.3.2-1 - Type:enhancement - Id:NA -- Gitee