From c930f915ef8e719343c0b9e5f39d7e4d39f9f3a9e2fbc0d566437ff0daff22fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 21 May 2024 08:22:07 +0000 Subject: [PATCH] Accepting request 1175333 from home:alarrosa:branches:devel:languages:python - If ffmpeg_pref is defined, use it, otherwise use ffmpeg-6 or ffmpeg-4 depening on suse_version. OBS-URL: https://build.opensuse.org/request/show/1175333 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pydub?expand=0&rev=24 --- python-pydub.changes | 6 ++++++ python-pydub.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/python-pydub.changes b/python-pydub.changes index af63bff..b12a292 100644 --- a/python-pydub.changes +++ b/python-pydub.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 20 11:49:43 UTC 2024 - Antonio Larrosa + +- If ffmpeg_pref is defined, use it, otherwise use ffmpeg-6 or + ffmpeg-4 depening on suse_version. + ------------------------------------------------------------------- Fri May 17 11:30:40 UTC 2024 - Antonio Larrosa diff --git a/python-pydub.spec b/python-pydub.spec index 2f96411..452924e 100644 --- a/python-pydub.spec +++ b/python-pydub.spec @@ -16,11 +16,13 @@ # +%if 0%{?!ffmpeg_pref:1} %if 0%{?suse_version} >= 1550 %define ffmpeg_pref ffmpeg-6 %else %define ffmpeg_pref ffmpeg-4 %endif +%endif Name: python-pydub Version: 0.25.1 @@ -34,13 +36,13 @@ Source: https://github.com/jiaaro/pydub/archive/v%{version}.tar.gz#/pydu Patch0: skip_libopenh264-7.patch # PATCH-FIX-UPSTREAM gh#jiaaro/pydub#769 Patch1: fix-assertions.patch +BuildRequires: %{ffmpeg_pref} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} BuildRequires: %{python_module scipy} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module wheel} BuildRequires: fdupes -BuildRequires: %{ffmpeg_pref} BuildConflicts: %{ffmpeg_pref}-mini-libs BuildRequires: python-rpm-macros Requires: %{ffmpeg_pref}