[rpms/ffmpeg] rawhide: Add Conflicts to avoid installation of mismatched -free and -freeworld builds

[Dominik 'Rathann' Mierzejewski <dominik@greysector.net>]

A new commit has been pushed.

Repo   : rpms/ffmpeg
Branch : rawhide
Commit : ed358b89c9e7c495b2f37ab46efd49e0a968c16a
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date   : 2026-06-14T14:44:34+02:00
Stats  : +9/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/ed358b89c9e7c495b2f37ab46efd49e0a968c16a?branch=rawhide

Log:
Add Conflicts to avoid installation of mismatched -free and -freeworld builds

---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5f8acc9..bbe89f2 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -108,7 +108,7 @@ Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
 Version:        8.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPL-3.0-or-later
 URL:            https://ffmpeg.org/
@@ -371,6 +371,8 @@ Requires:       libswresample%{?pkg_suffix}%{_isa} = %{version}-%{release}
 # We require libopenh264 library, which has a dummy implementation and a real one
 # In the event that this is being installed, we want to prefer openh264 if available
 Suggests:       openh264%{_isa}
+# Avoid installing mismatched -free and -freeworld builds
+Conflicts:      libavcodec-freeworld%{_isa} < %{version}
 
 %description -n libavcodec%{?pkg_suffix}
 The libavcodec library provides a generic encoding/decoding framework
@@ -662,6 +664,8 @@ Supplements:    libavcodec%{?basepkg_suffix}%{_isa} >= %{version}-%{release}
 # We require libopenh264 library, which has a dummy implementation and a real one
 # In the event that this is being installed, we want to install this version
 Requires:       openh264%{_isa}
+# Avoid installing mismatched -free and -freeworld builds
+Conflicts:      libavcodec-free%{_isa} < %{version}
 
 %description -n libavcodec-freeworld
 The libavcodec library provides a generic encoding/decoding framework
@@ -972,6 +976,10 @@ rm -rf %{buildroot}%{_datadir}
 
 
 %changelog
+* Thu May 21 2026 Dominik Mierzejewski <dominik@greysector.net> - 8.1.1-2
+- Add Conflicts to prevent installation of mismatched -free and -freeworld
+  builds
+
 * Sat May 09 2026 Dominik Mierzejewski <dominik@greysector.net> - 8.1.1-1
 - Update to 8.1.1
 - Drop merged patch