From 07f480b6ea3d9d16495b3a0aaed4a72d4621a86a71d448a7e394de44aa9ec91a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Mar 2020 08:08:07 +0000 Subject: [PATCH] - Fix build on Leap OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ffmpeg-python?expand=0&rev=5 --- python-ffmpeg-python.changes | 5 +++++ python-ffmpeg-python.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/python-ffmpeg-python.changes b/python-ffmpeg-python.changes index 7bac268..0e2c340 100644 --- a/python-ffmpeg-python.changes +++ b/python-ffmpeg-python.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 20 08:07:56 UTC 2020 - Tomáš Chvátal + +- Fix build on Leap + ------------------------------------------------------------------- Mon Mar 16 21:00:48 UTC 2020 - Martin Hauke diff --git a/python-ffmpeg-python.spec b/python-ffmpeg-python.spec index db6f300..0a3d137 100644 --- a/python-ffmpeg-python.spec +++ b/python-ffmpeg-python.spec @@ -23,12 +23,14 @@ Version: 0.2.0 Release: 0 Summary: Python bindings for FFmpeg License: Apache-2.0 -Group: Development/Languages/Python URL: https://github.com/kkroening/ffmpeg-python Source: https://github.com/kkroening/ffmpeg-python/archive/%{version}.tar.gz#/ffmpeg-python-%{version}.tar.gz BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-future +Recommends: ffmpeg +BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module future} BuildRequires: %{python_module pytest-mock} @@ -36,9 +38,6 @@ BuildRequires: %{python_module pytest-runner} BuildRequires: %{python_module pytest} BuildRequires: ffmpeg # /SECTION -Requires: python-future -Recommends: ffmpeg -BuildArch: noarch %python_subpackages %description @@ -55,8 +54,9 @@ Python bindings for FFmpeg - with complex filtering support %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# skip some tests since we do not have ffmpeg with mp4-support on the public OBS instance -%pytest -k 'not (test__run or test__run__multi_output)' +# skip some tests since we do not have FFmpeg with mp4-support on the public OBS instance +# test_pipe - fails on Leap due to too old FFmpeg +%pytest -k 'not (test__run or test__run__multi_output or test_pipe)' %files %{python_files} %license LICENSE