- Do not pull in the python2 as a dependency since we can build

fine with python3

- Fix the test execution
- Run fdupes during install

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/aubio?expand=0&rev=29
This commit is contained in:
Tomáš Chvátal 2020-01-30 13:16:09 +00:00 committed by Git OBS Bridge
parent 45b4b83e20
commit 1339c839aa
4 changed files with 28 additions and 16 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 30 13:15:23 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Do not pull in the python2 as a dependency since we can build
fine with python3
-------------------------------------------------------------------
Tue Feb 12 15:55:52 UTC 2019 - bjorn.lie@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package aubio
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -35,8 +35,8 @@ BuildRequires: libjack-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: pkg-config
BuildRequires: python-devel
%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
BuildRequires: python3-base
%if 0%{?suse_version} > 1315
BuildRequires: txt2man
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavdevice)
@ -82,16 +82,17 @@ This package includes the example programs for aubio library.
%prep
%setup -q
sed -e "s,/lib,/%{_lib}," src/wscript_build > src/wscript_build.new
diff -u src/wscript_build src/wscript_build.new || :
mv src/wscript_build.new src/wscript_build
# set proper library dir
sed -i -e "s#/lib#/%{_lib}#" src/wscript_build
# set python3 as testrunner
sed -i -e 's#python\ ${SRC}#python3 ${SRC}#g' tests/wscript_build
%build
./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
./waf build
python3 ./waf configure --prefix=%{_prefix} --libdir=%{_libdir}
python3 ./waf build -v %{?_smp_mflags}
%install
./waf install --destdir=%{buildroot}
python3 ./waf install --destdir=%{buildroot}
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -pR %{buildroot}%{_datadir}/doc/libaubio-doc/api %{buildroot}%{_docdir}/%{name}
rm -rf %{buildroot}%{_datadir}/doc/libaubio-doc
@ -112,7 +113,7 @@ rm -f %{buildroot}%{_libdir}/libaubio.a
%files tools
%doc %{_docdir}/%{name}
%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
%if 0%{?suse_version} > 1315
%{_mandir}/man1/*
%endif
%{_bindir}/*

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 30 13:08:20 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Fix the test execution
- Run fdupes during install
-------------------------------------------------------------------
Tue Feb 12 15:55:52 UTC 2019 - bjorn.lie@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package python-aubio
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,9 +27,10 @@ URL: http://aubio.org/
Source: http://aubio.org/pub/aubio-%{version}.tar.bz2
Source1: http://aubio.org/pub/aubio-%{version}.tar.bz2.asc
BuildRequires: %{python_module devel}
BuildRequires: %{python_module nose2}
BuildRequires: %{python_module numpy-devel}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-numpy
Requires(post): update-alternatives
@ -51,14 +52,12 @@ Its features include segmenting a sound file before each of its attacks, perform
%install
%python_install
%python_expand fdupes %{buildroot}/%{python_sitearch}
%python_clone -a %{buildroot}/%{_bindir}/aubio
%python_clone -a %{buildroot}/%{_bindir}/aubiocut
%check
%ifpython3
export PYTHONPATH=%{buildroot}/%{python_sitearch}
%python_exec setup.py test
%endif
%pytest_arch
%post
%python_install_alternative aubio