diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index f0c1317..6a6272f 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 16 17:54:51 UTC 2023 - Jan Engelhardt + +- Conflict with otherproviders(ffmpeg-tools). + ------------------------------------------------------------------- Fri Jan 20 07:22:58 UTC 2023 - Alynx Zhou diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index ffbb872..d91c0e5 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -259,10 +259,9 @@ BuildRequires: pkgconfig(x264) BuildRequires: pkgconfig(x265) %endif Provides: ffmpeg-tools = %version -Obsoletes: ffmpeg-tools < %version +Conflicts: ffmpeg-tools Provides: ffmpeg = %version Obsoletes: ffmpeg < %version -Conflicts: ffmpeg-5 Requires: libavcodec58_134 = %version-%release Requires: libavdevice58_13 = %version-%release Requires: libavfilter7_110 = %version-%release