diff --git a/mesa.spec b/mesa.spec index de4bdc6376a8dab7e8805060abbccb48a6bffc82..a35af70e571f9af480fabc5918d7908448334363 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global with_hardware 1 %global with_vulkan_hw 1 %global with_vdpau 1 @@ -110,18 +110,17 @@ Obsoletes: mesa-dri-filesystem < %{?epoch:%{epoch}:}%{version}-%{release} %package libGL Summary: Mesa libGL runtime libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-glx%{?_isa} >= 1:1.3.2 +Requires: %{name}-libglapi = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-glx >= 1:1.3.2 %description libGL %{summary}. %package libGL-devel Summary: Mesa libGL development package -Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} >= 1:1.3.2 +Requires: %{name}-libGL = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-devel >= 1:1.3.2 Provides: libGL-devel -Provides: libGL-devel%{?_isa} Recommends: gl-manpages %description libGL-devel @@ -129,25 +128,24 @@ Recommends: gl-manpages %package libEGL Summary: Mesa libEGL runtime libraries -Requires: libglvnd-egl%{?_isa} >= 1:1.3.2 +Requires: libglvnd-egl >= 1:1.3.2 %description libEGL %{summary}. %package libEGL-devel Summary: Mesa libEGL development package -Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} >= 1:1.3.2 -Requires: %{name}-khr-devel%{?_isa} +Requires: %{name}-libEGL = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: libglvnd-devel >= 1:1.3.2 +Requires: %{name}-khr-devel Provides: libEGL-devel -Provides: libEGL-devel%{?_isa} %description libEGL-devel %{summary}. %package dri-drivers Summary: Mesa-based DRI drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} %description dri-drivers %{summary}. @@ -155,7 +153,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %if 0%{?with_omx} %package omx-drivers Summary: Mesa-based OMX drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} %description omx-drivers %{summary}. @@ -164,7 +162,7 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %if 0%{?with_vdpau} %package vdpau-drivers Summary: Mesa-based VDPAU drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} %description vdpau-drivers %{summary}. @@ -172,16 +170,15 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %package libOSMesa Summary: Mesa offscreen rendering libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libglapi = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libOSMesa -Provides: libOSMesa%{?_isa} %description libOSMesa %{summary}. %package libOSMesa-devel Summary: Mesa offscreen rendering development package -Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libOSMesa = %{?epoch:%{epoch}:}%{version}-%{release} %description libOSMesa-devel %{summary}. @@ -189,16 +186,14 @@ Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rele %package libgbm Summary: Mesa gbm runtime library Provides: libgbm -Provides: libgbm%{?_isa} %description libgbm %{summary}. %package libgbm-devel Summary: Mesa libgbm development package -Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libgbm = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libgbm-devel -Provides: libgbm-devel%{?_isa} %description libgbm-devel %{summary}. @@ -207,16 +202,14 @@ Provides: libgbm-devel%{?_isa} %package libxatracker Summary: Mesa XA state tracker Provides: libxatracker -Provides: libxatracker%{?_isa} %description libxatracker %{summary}. %package libxatracker-devel Summary: Mesa XA state tracker development package -Requires: %{name}-libxatracker%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libxatracker = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libxatracker-devel -Provides: libxatracker-devel%{?_isa} %description libxatracker-devel %{summary}. @@ -225,7 +218,6 @@ Provides: libxatracker-devel%{?_isa} %package libglapi Summary: Mesa shared glapi Provides: libglapi -Provides: libglapi%{?_isa} %description libglapi %{summary}. @@ -233,9 +225,9 @@ Provides: libglapi%{?_isa} %if 0%{?with_opencl} %package libOpenCL Summary: Mesa OpenCL runtime library -Requires: ocl-icd%{?_isa} -Requires: libclc%{?_isa} -Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: ocl-icd +Requires: libclc +Requires: %{name}-libgbm = %{?epoch:%{epoch}:}%{version}-%{release} Requires: opencl-filesystem %description libOpenCL @@ -243,7 +235,7 @@ Requires: opencl-filesystem %package libOpenCL-devel Summary: Mesa OpenCL development package -Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libOpenCL = %{?epoch:%{epoch}:}%{version}-%{release} %description libOpenCL-devel %{summary}. @@ -258,7 +250,7 @@ Summary: Mesa Direct3D9 state tracker %package libd3d-devel Summary: Mesa Direct3D9 state tracker development package -Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libd3d = %{?epoch:%{epoch}:}%{version}-%{release} %description libd3d-devel %{summary}. @@ -266,7 +258,7 @@ Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release %package vulkan-drivers Summary: Mesa Vulkan drivers -Requires: vulkan%{_isa} +Requires: vulkan Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} %description vulkan-drivers @@ -548,5 +540,8 @@ popd %endif %changelog +* Mon Apr 25 2022 Chunmei Xu - 22.0.1-2 +- remove isa from requires + * Fri Apr 15 2022 Yuanhong Peng - 22.0.1-1 - Init package from upstream v22.0.1