[mesa-freeworld] Add conflicts to resolve dependencies from Fedora repo on update

commit 72b25197a8d50a4e8749e18ada82ac6c3a0dadc6 Author: Luya Tshimbalanga <luya(a)fedoraproject.org&gt; Date: Mon Jan 2 01:42:28 2023 -0800 Add conflicts to resolve dependencies from Fedora repo on update mesa-freeworld.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec index 1f1b302..02b0853 100644 --- a/mesa-freeworld.spec +++ b/mesa-freeworld.spec @@ -58,7 +58,7 @@ Name: %{srcname}-freeworld Summary: Mesa graphics libraries %global ver 22.3.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -151,6 +151,8 @@ Summary: Mesa-based VA-API drivers Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version} Provides: %{srcname}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{srcname}-va-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +# Prevents mesa from fedora repo to overwrite the update +Conflicts: %{srcname}-va-drivers >= %{?epoch:%{epoch}:}%{version}-%{release} Enhances: %{srcname}%{?_isa} %description -n %{srcname}-va-drivers-freeworld @@ -163,6 +165,8 @@ Summary: Mesa-based VDPAU drivers Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version} Provides: %{srcname}-vdpau-drivers = %{?epoch:%{epoch}:}%{version}-%{release} Provides: %{srcname}-vdpau-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +# Prevents mesa from fedora repo to overwrite the update +Conflicts: %{srcname}-vdpau-drivers > %{?epoch:%{epoch}:}%{version}-%{release} Enhances: %{srcname}%{?_isa} %description -n %{srcname}-vdpau-drivers-freeworld @@ -293,6 +297,9 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so %endif %changelog +* Sun Jan 1 2023 Luya Tshimbalanga <luya(a)fedoraproject.org&gt; - 22.3.2-2 +- Add conflicts to resolve dependencies from Fedora repo on update + * Sat Dec 31 2022 Thorsten Leemhuis <fedora(a)leemhuis.info&gt; - 22.3.2-1 - Update to 22.3.2