From 81a4cfd5f545271a8c762f13dc203a9af2453bccc30b36c40c9ffd53a36af3d2 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 12 Apr 2017 09:54:46 +0000 Subject: [PATCH] - let Mesa require Mesa-libGL1 for a libglvnd build (bsc#1033708) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=593 --- Mesa.changes | 5 +++++ Mesa.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 6ce5cbf..c412f8d 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 12 09:44:35 UTC 2017 - sndirsch@suse.com + +- let Mesa require Mesa-libGL1 for a libglvnd build (bsc#1033708) + ------------------------------------------------------------------- Fri Apr 7 14:51:09 UTC 2017 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index d3167fb..a637461 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -180,6 +180,7 @@ BuildRequires: llvm-clang-devel %endif %if 0%{?libglvnd} +Requires: Mesa-libGL1 = %{version} Requires: libglvnd0 >= 0.1.0 %endif @@ -401,8 +402,8 @@ applications using the OpenGL|ES 3.x APIs. %package -n libOSMesa8 Summary: Mesa Off-screen rendering extension -Group: System/Libraries # Wrongly named package shipped .so.8 +Group: System/Libraries Obsoletes: libOSMesa9 < %{version}-%{release} Provides: libOSMesa9 = %{version}-%{release} @@ -508,8 +509,8 @@ implementation of Mesa. %package libd3d Summary: Mesa Direct3D9 state tracker -Group: System/Libraries # Manually provide d3d library (bnc#918294) +Group: System/Libraries %ifarch x86_64 s390x ppc64le aarch64 Provides: d3dadapter9.so.1()(64bit) %else