From f0c55fd563696f96f03eb596046bed6431269d374d818fdb1a77ec1df9d20521 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 4 Jan 2023 13:30:15 +0000 Subject: [PATCH] Add conflicts between mini-devel and ffmpeg-*-lib*-devel OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=41 --- ffmpeg-5-mini-devel.spec | 10 +++++++++- ffmpeg-5.spec | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ffmpeg-5-mini-devel.spec b/ffmpeg-5-mini-devel.spec index f2c6634..84d18e8 100644 --- a/ffmpeg-5-mini-devel.spec +++ b/ffmpeg-5-mini-devel.spec @@ -1,7 +1,7 @@ # # spec file for package ffmpeg-5-mini-devel # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,14 @@ Source2: https://www.ffmpeg.org/releases/%_name-%version.tar.xz.asc Source3: %name-rpmlintrc Source98: http://ffmpeg.org/ffmpeg-devel.asc#/ffmpeg-5.keyring BuildRequires: c_compiler +Conflicts: libavcodec-devel +Conflicts: libavdevice-devel +Conflicts: libavfilter-devel +Conflicts: libavformat-devel +Conflicts: libavutil-devel +Conflicts: libpostproc-devel +Conflicts: libswscale-devel +Conflicts: libswswresample-devel %description FFmpeg is a multimedia framework. This package merely builds diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index 5d0a802..0eb442f 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -1,7 +1,7 @@ # # spec file for package ffmpeg-5 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed