Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lscsoft-glue for openSUSE:Factory checked in at 2021-01-21 21:54:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lscsoft-glue (Old) and /work/SRC/openSUSE:Factory/.lscsoft-glue.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lscsoft-glue" Thu Jan 21 21:54:16 2021 rev:3 rq:864176 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lscsoft-glue/lscsoft-glue.changes 2020-11-04 18:31:46.368230114 +0100 +++ /work/SRC/openSUSE:Factory/.lscsoft-glue.new.28504/lscsoft-glue.changes 2021-01-21 21:54:17.409768779 +0100 @@ -1,0 +2,8 @@ +Mon Jan 18 19:11:38 UTC 2021 - Benjamin Greiner <[email protected]> + +- Install commands with update-alternatives to avoid conflicts with + multiple python3 flavors +- Test in multibuild to avoid dependency cycle with python-lal + (runtime dep) + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lscsoft-glue.spec ++++++ --- /var/tmp/diff_new_pack.j91jcr/_old 2021-01-21 21:54:17.953768985 +0100 +++ /var/tmp/diff_new_pack.j91jcr/_new 2021-01-21 21:54:17.957768987 +0100 @@ -1,7 +1,7 @@ # # spec file for package lscsoft-glue # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,32 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%bcond_without test +%define psuffix -test +# Tests known to fail on 32 bit due to fp precision +ExcludeArch: %{ix86} +%else +%bcond_with test +%define psuffix %{nil} +%endif + +%define ligocommands ligolw_print_tables dmtdq_seg_insert ldbdc ldbdd ldg_submit_dax \ + ligolw_cbc_glitch_page ligolw_combine_segments ligolw_diff ligolw_dq_active ligolw_dq_active_cats \ + ligolw_dq_grapher ligolw_dq_query ligolw_geo_fr_to_dq ligolw_inspiral2mon \ + ligolw_publish_dqxml ligolw_segment_diff ligolw_segment_insert ligolw_segment_intersect \ + ligolw_segment_query ligolw_segment_union ligolw_segments_from_cats ligolw_segments_from_cats_split \ + ligolw_veto_def_check ligolw_veto_sngl_trigger segdb_coalesce + %define modname glue -Name: lscsoft-glue +Name: lscsoft-glue%{psuffix} Version: 2.1.0 Release: 0 Summary: Grid LSC User Environment License: GPL-2.0-only URL: http://software.ligo.org/lscsoft -Source: http://software.ligo.org/lscsoft/source/%{name}-%{version}.tar.gz +Source: http://software.ligo.org/lscsoft/source/lscsoft-glue-%{version}.tar.gz BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -32,13 +50,13 @@ Requires: python-numpy Provides: python-glue = %{version} Obsoletes: python-glue < %{version} -# SECTION Test Requirements +%if %{with test} BuildRequires: %{python_module lal} BuildRequires: %{python_module ligo-segments} +BuildRequires: %{python_module lscsoft-glue = %{version}} BuildRequires: %{python_module matplotlib} BuildRequires: %{python_module numpy} -# /SECTION - +%endif %python_subpackages %description @@ -48,12 +66,13 @@ database. %prep -%setup -q -n %{name}-%{version} +%setup -q -n lscsoft-glue-%{version} %build %python_build %install +%if ! %{with test} %python_install # SECTION Remove non-library config/php files @@ -61,23 +80,40 @@ rm -fr %{buildroot}%{_prefix}%{_localstatedir} # /SECTION +%{lua: for c in string.gmatch(rpm.expand("%ligocommands"), "%S+") do + print(rpm.expand("%python_clone -a %{buildroot}%{_bindir}/" .. c .. "\n")) +end} + %python_expand %fdupes -s %{buildroot}%{$python_sitearch} +%endif -# Tests known to fail on 32 bit due to fp precision -%ifnarch %ix86 %check -export PYTHON=%{__python3} +%if %{with test} +%{python_expand export PYTHON=$python export PYTHONDONTWRITEBYTECODE=1 -export PYTHONPATH=%{buildroot}%{python3_sitearch} -pushd test +cp -r test test-%{$python_bin_suffix} +pushd test-%{$python_bin_suffix} %make_build check popd +} %endif +%if ! %{with test} +%post +%python_install_alternative %ligocommands + +%postun +# arguments after the master item are ignored +%python_uninstall_alternative %ligocommands + %files %{python_files} %doc README.md %license LICENSE -%python3_only %{_bindir}/* -%{python_sitearch}/* +%{lua: for c in string.gmatch(rpm.expand("%ligocommands"), "%S+") do + print(rpm.expand("%python_alternative %{_bindir}/" .. c .. "\n")) +end} +%{python_sitearch}/glue +%{python_sitearch}/lscsoft_glue-%{version}*-info +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild>
