From 7797a21af39ef33ad71734b1aeab4b7dfa131ee7b0e48f15729fb12d5cfceaa2 Mon Sep 17 00:00:00 2001 From: Guillaume Gardet Date: Mon, 25 Nov 2024 10:50:05 +0100 Subject: [PATCH] Do not require %version-%release for libs, but only %version as %release can be out of sync on OBS --- ffmpeg-7.changes | 6 ++++++ ffmpeg-7.spec | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ffmpeg-7.changes b/ffmpeg-7.changes index fddea60..3bfdb1c 100644 --- a/ffmpeg-7.changes +++ b/ffmpeg-7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 25 09:45:19 UTC 2024 - Guillaume GARDET + +- Do not require %version-%release for libs, but only %version as + %release can be out of sync on OBS + ------------------------------------------------------------------- Tue Oct 15 08:18:54 UTC 2024 - Antonio Larrosa diff --git a/ffmpeg-7.spec b/ffmpeg-7.spec index ef22b03..8a50b71 100644 --- a/ffmpeg-7.spec +++ b/ffmpeg-7.spec @@ -249,14 +249,14 @@ Provides: ffmpeg-tools = %version Conflicts: ffmpeg-tools Provides: ffmpeg = %version Obsoletes: ffmpeg < %version -Requires: (libavcodec61 = %version-%release or ffmpeg-7-mini-libs = %version-%release) -Requires: (libavdevice61 = %version-%release or ffmpeg-7-mini-libs = %version-%release) -Requires: (libavfilter10 = %version-%release or ffmpeg-7-mini-libs = %version-%release) -Requires: (libavformat61 = %version-%release or ffmpeg-7-mini-libs = %version-%release) -Requires: (libavutil59 = %version-%release or ffmpeg-7-mini-libs = %version-%release) -Requires: (libpostproc58 = %version-%release or ffmpeg-7-mini-libs = %version-%release) -Requires: (libswresample5 = %version-%release or ffmpeg-7-mini-libs = %version-%release) -Requires: (libswscale8 = %version-%release or ffmpeg-7-mini-libs = %version-%release) +Requires: (libavcodec61 = %version or ffmpeg-7-mini-libs = %version) +Requires: (libavdevice61 = %version or ffmpeg-7-mini-libs = %version) +Requires: (libavfilter10 = %version or ffmpeg-7-mini-libs = %version) +Requires: (libavformat61 = %version or ffmpeg-7-mini-libs = %version) +Requires: (libavutil59 = %version or ffmpeg-7-mini-libs = %version) +Requires: (libpostproc58 = %version or ffmpeg-7-mini-libs = %version) +Requires: (libswresample5 = %version or ffmpeg-7-mini-libs = %version) +Requires: (libswscale8 = %version or ffmpeg-7-mini-libs = %version) %description FFmpeg is a multimedia framework, able to decode, encode,