Hello community, here is the log from the commit of package aubio for openSUSE:Factory checked in at 2020-02-04 19:51:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aubio (Old) and /work/SRC/openSUSE:Factory/.aubio.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aubio" Tue Feb 4 19:51:47 2020 rev:27 rq:769954 version:0.4.9 Changes: -------- --- /work/SRC/openSUSE:Factory/aubio/aubio.changes 2019-02-27 15:05:30.486458654 +0100 +++ /work/SRC/openSUSE:Factory/.aubio.new.26092/aubio.changes 2020-02-04 19:52:04.409276814 +0100 @@ -1,0 +2,6 @@ +Thu Jan 30 13:15:23 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Do not pull in the python2 as a dependency since we can build + fine with python3 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/aubio/python-aubio.changes 2019-02-27 15:05:30.798458562 +0100 +++ /work/SRC/openSUSE:Factory/.aubio.new.26092/python-aubio.changes 2020-02-04 19:52:04.457276842 +0100 @@ -1,0 +2,11 @@ +Tue Feb 4 11:55:13 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Skip two tests that fail to pass on 32bit machines + +------------------------------------------------------------------- +Thu Jan 30 13:08:20 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Fix the test execution +- Run fdupes during install + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aubio.spec ++++++ --- /var/tmp/diff_new_pack.syOKZv/_old 2020-02-04 19:52:05.557277483 +0100 +++ /var/tmp/diff_new_pack.syOKZv/_new 2020-02-04 19:52:05.561277485 +0100 @@ -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: 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 @@ %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 @@ %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}/* ++++++ python-aubio.spec ++++++ --- /var/tmp/diff_new_pack.syOKZv/_old 2020-02-04 19:52:05.593277504 +0100 +++ /var/tmp/diff_new_pack.syOKZv/_new 2020-02-04 19:52:05.593277504 +0100 @@ -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 @@ 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,13 @@ %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 +# the two tests fail on 32bit due to precision issue +%pytest_arch -k 'not (test_meltohz or test_hztomel)' %post %python_install_alternative aubio
