From 96e1f0dbe7f0a879dc5f78f74cbace8904a8343d237966e79d61143b17d39bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 17 May 2024 13:16:41 +0000 Subject: [PATCH] Accepting request 1174846 from home:alarrosa:branches:devel:languages:python - Build with ffmpeg-6 in TW and ffmpeg-4 in Leap OBS-URL: https://build.opensuse.org/request/show/1174846 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pydub?expand=0&rev=23 --- python-pydub.changes | 5 +++++ python-pydub.spec | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/python-pydub.changes b/python-pydub.changes index bba3153..af63bff 100644 --- a/python-pydub.changes +++ b/python-pydub.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 17 11:30:40 UTC 2024 - Antonio Larrosa + +- Build with ffmpeg-6 in TW and ffmpeg-4 in Leap + ------------------------------------------------------------------- Mon Mar 25 04:56:28 UTC 2024 - Steve Kowalik diff --git a/python-pydub.spec b/python-pydub.spec index 34bbfeb..2f96411 100644 --- a/python-pydub.spec +++ b/python-pydub.spec @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} >= 1550 +%define ffmpeg_pref ffmpeg-6 +%else +%define ffmpeg_pref ffmpeg-4 +%endif + Name: python-pydub Version: 0.25.1 Release: 0 @@ -34,13 +40,13 @@ BuildRequires: %{python_module scipy} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes -BuildRequires: ffmpeg-5 +BuildRequires: %{ffmpeg_pref} +BuildConflicts: %{ffmpeg_pref}-mini-libs BuildRequires: python-rpm-macros +Requires: %{ffmpeg_pref} Recommends: python-scipy Recommends: python-simpleaudio -Requires: ffmpeg-5 BuildArch: noarch - %python_subpackages %description