From 90b8effb5d8cb60e84b4c56e4a5a759b09d5390dc7a90c3056fbc039c40de447 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Mar 2023 17:55:19 +0000 Subject: [PATCH] - Conflict with otherproviders(ffmpeg-tools). OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=194 --- ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) 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