From c6c76ab098bf7279fc758047d104f95275838061 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 18 Apr 2023 14:05:52 +0200 Subject: [PATCH 1/2] Enforces version to avoid miss-match with fedora Fixes rfbz#6613 --- mesa-freeworld.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec index 397c183..b36652a 100644 --- a/mesa-freeworld.spec +++ b/mesa-freeworld.spec @@ -148,7 +148,7 @@ BuildRequires: pkgconfig(vulkan) %if 0%{?with_va} %package -n %{srcname}-va-drivers-freeworld Summary: Mesa-based VA-API drivers -Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version} +Requires: %{srcname}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version} %description -n %{srcname}-va-drivers-freeworld %{_description} @@ -157,7 +157,7 @@ Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version} %if 0%{?with_vdpau} %package -n %{srcname}-vdpau-drivers-freeworld Summary: Mesa-based VDPAU drivers -Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version} +Requires: %{srcname}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version} %description -n %{srcname}-vdpau-drivers-freeworld %{_description} From fb4fb5f0e45a8d70fd3348c1118be34cb90c9952 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 18 Apr 2023 14:19:38 +0200 Subject: [PATCH 2/2] Re-introduce Conflicts - rfbz#6612 This time the related provides aren't added so this avoid the conflicts with itslef. This also relies upon unversioned Recommends in the fedora counterparts to avoid packages been replaced in end-users back. --- mesa-freeworld.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec index b36652a..963760e 100644 --- a/mesa-freeworld.spec +++ b/mesa-freeworld.spec @@ -149,6 +149,7 @@ BuildRequires: pkgconfig(vulkan) %package -n %{srcname}-va-drivers-freeworld Summary: Mesa-based VA-API drivers Requires: %{srcname}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version} +Conflicts: %{srcname}-va-drivers%{?_isa} %description -n %{srcname}-va-drivers-freeworld %{_description} @@ -158,6 +159,7 @@ Requires: %{srcname}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version} %package -n %{srcname}-vdpau-drivers-freeworld Summary: Mesa-based VDPAU drivers Requires: %{srcname}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version} +Conflicts: %{srcname}-vdpau-drivers%{?_isa} %description -n %{srcname}-vdpau-drivers-freeworld %{_description}