From 67709a7565da70745c4013f35aa9cdb18ebacb14 Mon Sep 17 00:00:00 2001 From: songnannan Date: Tue, 14 Jan 2020 21:36:08 +0800 Subject: [PATCH 1/2] delete isa in obsoletes --- libglvnd.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libglvnd.spec b/libglvnd.spec index 724090c..85e6ec0 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -1,6 +1,6 @@ Name: libglvnd Version: 1.2.0 -Release: 2 +Release: 3 Epoch: 1 Summary: The GL Vendor-Neutral Dispatch library License: MIT @@ -14,11 +14,11 @@ Requires: mesa-libEGL%{?_isa} >= 13.0.4-1 Requires: mesa-libGL%{?_isa} >= 13.0.4-1 Provides: %{name}-egl %{name}-egl%{?_isa} %{name}-gles %{name}-gles%{?_isa} %{name}-glx -Obsoletes: %{name}-egl %{name}-egl%{?_isa} %{name}-gles %{name}-gles%{?_isa} %{name}-glx +Obsoletes: %{name}-egl %{name}-gles %{name}-glx Provides: %{name}-glx%{?_isa} %{name}-opengl %{name}-opengl%{?_isa} libGLES libGLES%{?_isa} -Obsoletes: %{name}-glx%{?_isa} %{name}-opengl %{name}-opengl%{?_isa} libGLES libGLES%{?_isa} -Provides: libEG libEGL%{?_isa} libEGL libEGL%{?_isa} libGL libGL%{?_isa} -Obsoletes: libEG libEGL%{?_isa} libEGL libEGL%{?_isa} libGL libGL%{?_isa} +Obsoletes: %{name}-opengl libGLES +Provides: libEG libEGL%{?_isa} libGL libGL%{?_isa} +Obsoletes: libEG libEGL libGL %description libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors. @@ -74,8 +74,18 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || (cat `find . -name test- %{_libdir}/lib*.so %{_libdir}/pkgconfig/libglvnd.pc %{_includedir}/glvnd/* +%exclude %{_includedir}/*G* +%exclude %{_includedir}/KHR +%exclude %{_libdir}/pkgconfig/g*.pc +%exclude %{_libdir}/pkgconfig/*gl.pc %changelog +* Tue Jan 14 2020 openEuler Buildteam - 1:1.2.0-3 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:delete the arch in obsoletes + * Tue Jan 14 2020 openEuler Buildteam - 1:1.2.0-2 - Type:enhancement - Id:NA -- Gitee From 08ffc45b0f1ad3d4efeba75af1a5058c1a5181a1 Mon Sep 17 00:00:00 2001 From: songnannan Date: Tue, 14 Jan 2020 21:43:37 +0800 Subject: [PATCH 2/2] delete isa in obsoletes --- libglvnd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libglvnd.spec b/libglvnd.spec index 85e6ec0..10ffecf 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -17,7 +17,7 @@ Provides: %{name}-egl %{name}-egl%{?_isa} %{name}-gles %{name}-gles%{?_isa Obsoletes: %{name}-egl %{name}-gles %{name}-glx Provides: %{name}-glx%{?_isa} %{name}-opengl %{name}-opengl%{?_isa} libGLES libGLES%{?_isa} Obsoletes: %{name}-opengl libGLES -Provides: libEG libEGL%{?_isa} libGL libGL%{?_isa} +Provides: libEG libEGL libEGL%{?_isa} libGL libGL%{?_isa} Obsoletes: libEG libEGL libGL %description -- Gitee