From a40564ee7c889ff7423458a309dbe00e9701b2f3a1eed17bf442d01069eaa59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 27 Mar 2025 11:18:53 +0100 Subject: [PATCH] Fix BcntSync handling --- ffmpeg-7.changes | 5 +++++ ffmpeg-7.spec | 14 ++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ffmpeg-7.changes b/ffmpeg-7.changes index 4163cbe..78bd08e 100644 --- a/ffmpeg-7.changes +++ b/ffmpeg-7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 25 11:48:21 UTC 2025 - Adrian Schröter + +- Move BcntSync tag to the %else part where the mini package gets defined + ------------------------------------------------------------------- Sun Mar 23 23:21:26 UTC 2025 - Mia Herkt diff --git a/ffmpeg-7.spec b/ffmpeg-7.spec index 8c5ce07..eec14fd 100644 --- a/ffmpeg-7.spec +++ b/ffmpeg-7.spec @@ -270,14 +270,6 @@ Requires: (libavutil59 = %version-%release or ffmpeg-7-mini-libs = %versio 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) -%if "%flavor" == "ffmpeg-7-mini" -# Patches may subtly change internal APIs, so we're sticking %%release in -# Requires lines. It also conveniently blocks openSUSE libav* being combined -# with Packman libav*, due to PM's unique %%release numbers. -# This use of %%release with %flavor however requires bcnt synchro: -# -#!BcntSyncTag: ffmpeg-7 -%endif %description FFmpeg is a multimedia framework, able to decode, encode, @@ -831,6 +823,12 @@ done %else %define _name ffmpeg +# Patches may subtly change internal APIs, so we're sticking %%release in +# Requires lines. It also conveniently blocks openSUSE libav* being combined +# with Packman libav*, due to PM's unique %%release numbers. +# This use of %%release with %flavor however requires bcnt synchro: +# +#!BcntSyncTag: ffmpeg-7 Name: ffmpeg-7-mini Version: 7.1 Release: 0 -- 2.49.0