From ce2a8cac2f4d7a433f24f2bc9c70659e0eae39f0f5732d2eb9b5480ec74a284b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Mar 2023 17:55:45 +0000 Subject: [PATCH] - Conflict with otherproviders(ffmpeg-tools). OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=62 --- ffmpeg-5.changes | 5 +++++ ffmpeg-5.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index aceca96..8b4af5e 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 16 17:55:37 UTC 2023 - Jan Engelhardt + +- Conflict with otherproviders(ffmpeg-tools). + ------------------------------------------------------------------- Mon Mar 13 11:54:15 UTC 2023 - Jan Engelhardt diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index 09634a7..b3b0d88 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -230,7 +230,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: libavcodec59 = %version-%release