commit 5e4cdf851b243b52dfffd3b66394568c1486f4ae Author: Thorsten Leemhuis <linux(a)leemhuis.info&gt; Date: Thu Apr 20 15:40:30 2023 +0200 Re-introduce Conflicts (rfbz#6612, kwizart) Enforces version to avoid miss-match with fedora (rfbz#6613, kwizart) Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info&gt; mesa-freeworld.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec index 200206d..38c1ca4 100644 --- a/mesa-freeworld.spec +++ b/mesa-freeworld.spec @@ -58,7 +58,7 @@ Name: %{srcname}-freeworld Summary: Mesa graphics libraries %global ver 23.0.2 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 1%{?dist}.1 License: MIT URL: http://www.mesa3d.org @@ -148,7 +148,8 @@ 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} +Conflicts: %{srcname}-va-drivers%{?_isa} %description -n %{srcname}-va-drivers-freeworld %{_description} @@ -157,7 +158,8 @@ 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} +Conflicts: %{srcname}-vdpau-drivers%{?_isa} %description -n %{srcname}-vdpau-drivers-freeworld %{_description} @@ -286,6 +288,10 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so %license docs/license.rst %endif %changelog +* Thu Apr 20 2023 Thorsten Leemhuis <fedora(a)leemhuis.info&gt; - 23.0.2-1.1 +- Re-introduce Conflicts (rfbz#6612, kwizart) +- Enforces version to avoid miss-match with fedora (rfbz#6613, kwizart) + * Thu Apr 13 2023 Thorsten Leemhuis <fedora(a)leemhuis.info&gt; - 23.0.2-1 - Update to 23.0.2