diff --git a/ffmpeg-6.changes b/ffmpeg-6.changes index 98f1ef8..1aa1892 100644 --- a/ffmpeg-6.changes +++ b/ffmpeg-6.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 16 17:56:04 UTC 2023 - Jan Engelhardt + +- Conflict with otherproviders(ffmpeg-tools). + ------------------------------------------------------------------- Thu Mar 9 09:02:01 UTC 2023 - Enrico Belleri diff --git a/ffmpeg-6.spec b/ffmpeg-6.spec index 24b50f5..834b66d 100644 --- a/ffmpeg-6.spec +++ b/ffmpeg-6.spec @@ -225,7 +225,7 @@ BuildRequires: pkgconfig(x264) BuildRequires: pkgconfig(x265) %endif Provides: ffmpeg-tools = %version -Obsoletes: ffmpeg-tools < %version +Conflicts: ffmpeg-tools Provides: ffmpeg = %version Obsoletes: ffmpeg < %version Requires: libavcodec60 = %version-%release