From 6484427f0ca7452fb916fa9209e35f27c10bfcf1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 29 Aug 2024 15:02:50 +0100 Subject: [PATCH] Fix up some directory ownerships The vulkan drivers package ships some files in a directory owned by the filesystem package, and there's another dir that has crossover so move it to the filesystem package. Move the vdpau to it's subpackage as it's only used by that package so it doesn't need to be in filesystem. --- mesa.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mesa.spec b/mesa.spec index ad1a347..72c9e97 100644 --- a/mesa.spec +++ b/mesa.spec @@ -384,6 +384,7 @@ Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release %package vulkan-drivers Summary: Mesa Vulkan drivers Requires: vulkan%{_isa} +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} %description vulkan-drivers @@ -492,16 +493,13 @@ popd %files filesystem %doc docs/Mesa-MLAA-License-Clarification-Email.txt %dir %{_libdir}/dri -%if 0%{?with_hardware} -%if 0%{?with_vdpau} -%dir %{_libdir}/vdpau -%endif -%endif +%dir %{_datadir}/drirc.d %files libGL %{_libdir}/libGLX_mesa.so.0* %{_libdir}/libGLX_system.so.0* %files libGL-devel +%dir %{_includedir}/GL %dir %{_includedir}/GL/internal %{_includedir}/GL/internal/dri_interface.h %{_libdir}/pkgconfig/dri.pc @@ -581,7 +579,6 @@ popd %endif %files dri-drivers -%dir %{_datadir}/drirc.d %{_datadir}/drirc.d/00-mesa-defaults.conf %{_libdir}/libgallium-*.so %{_libdir}/dri/kms_swrast_dri.so @@ -700,6 +697,7 @@ popd %if 0%{?with_vdpau} %files vdpau-drivers +%dir %{_libdir}/vdpau %{_libdir}/vdpau/libvdpau_gallium.so.1* %{_libdir}/vdpau/libvdpau_nouveau.so.1* %if 0%{?with_r600}