Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lalinference for openSUSE:Factory checked in at 2022-08-24 15:11:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lalinference (Old) and /work/SRC/openSUSE:Factory/.lalinference.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lalinference" Wed Aug 24 15:11:09 2022 rev:7 rq:998929 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lalinference/lalinference.changes 2022-04-26 20:17:49.880765244 +0200 +++ /work/SRC/openSUSE:Factory/.lalinference.new.2083/lalinference.changes 2022-08-24 15:11:27.304521422 +0200 @@ -1,0 +2,23 @@ +Tue Aug 23 23:48:59 UTC 2022 - Atri Bhattacharya <badshah...@gmail.com> + +- Fix multibuild package names. + +------------------------------------------------------------------- +Fri Aug 19 20:29:48 UTC 2022 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 4.0.0: + * No release notes. +- Drop lalinference-import-MutableMapping.patch: incorporated + upstream. +- Drop BuildRequires on lalpulsar-devel and python-lalpulsar + (indeed now lalpulsar depends on lalinference-devel). +- Update source URL. +- Update so version to match upstream. +- Re-organise list of BuildRequires to differentiate packages + needed for building proper vs those needed for tests only. +- Tests can take a long time, split testing as part of %check + into its own _multibuild flavour. +- Make %{name}-data a noarch package. +- New BuildRequires for tests: python-h5py. + +------------------------------------------------------------------- Old: ---- lalinference-3.0.1.tar.xz lalinference-import-MutableMapping.patch New: ---- _multibuild lalinference-4.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lalinference.spec ++++++ --- /var/tmp/diff_new_pack.SzxZXn/_old 2022-08-24 15:11:27.696521800 +0200 +++ /var/tmp/diff_new_pack.SzxZXn/_new 2022-08-24 15:11:27.700521805 +0200 @@ -16,7 +16,18 @@ # -%define shlib lib%{name}22 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%bcond_without test +%define psuffix -test +%else +%bcond_with test +%define psuffix %{nil} +%endif + +%define pname lalinference + +%define shlib lib%{name}23 # octave >= 6 not supported %bcond_with octave @@ -24,54 +35,51 @@ %define skip_python2 1 %define skip_python36 1 -Name: lalinference -Version: 3.0.1 +Name: %{pname}%{?psuffix} +Version: 4.0.0 Release: 0 Summary: LSC Algorithm Inference Library License: GPL-2.0-or-later Group: Productivity/Scientific/Physics URL: https://wiki.ligo.org/Computing/DASWG/LALSuite -Source: http://software.ligo.org/lscsoft/source/lalsuite/%{name}-%{version}.tar.xz +Source: https://software.igwn.org/sources/source/lalsuite/%{pname}-%{version}.tar.xz # PATCH-FIX-UPSTREAM lalinference-printf-data-type-consistency.patch badshah...@gmail.com -- Cast data passed to printf from size_t to long to make it consistent with the format "%li"; this fixes build failures on i586 Patch0: lalinference-printf-data-type-consistency.patch -# PATCH-FIX-UPSTREAM lalinference-import-MutableMapping.patch badshah...@gmail.com -- lalinference.wrapper: Update import of MutableMapping -Patch1: lalinference-import-MutableMapping.patch -BuildRequires: %{python_module Shapely} -BuildRequires: %{python_module astropy} BuildRequires: %{python_module devel} -BuildRequires: %{python_module glue >= 1.54.1} -BuildRequires: %{python_module lal >= 7.1.0} -BuildRequires: %{python_module lalburst >= 1.5.3} -BuildRequires: %{python_module lalframe >= 1.4.0} -BuildRequires: %{python_module lalinspiral >= 2.0.0} -BuildRequires: %{python_module lalmetaio >= 2.0.0} -BuildRequires: %{python_module lalpulsar >= 3.0.0} -BuildRequires: %{python_module lalsimulation >= 2.5.0} -BuildRequires: %{python_module matplotlib >= 1.2.0} BuildRequires: %{python_module numpy-devel >= 1.7} -BuildRequires: %{python_module numpy} -BuildRequires: %{python_module scipy >= 0.9.0} BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: swig BuildRequires: pkgconfig(gsl) -BuildRequires: pkgconfig(lal) -BuildRequires: pkgconfig(lalburst) -BuildRequires: pkgconfig(lalframe) -BuildRequires: pkgconfig(lalinspiral) -BuildRequires: pkgconfig(lalmetaio) -BuildRequires: pkgconfig(lalpulsar) -BuildRequires: pkgconfig(lalsimulation) -BuildRequires: pkgconfig(libmetaio) -# SECTION For tests (python3 only) +BuildRequires: pkgconfig(lal) >= 7.2.0 +BuildRequires: pkgconfig(lalburst) >= 1.6.0 +BuildRequires: pkgconfig(lalframe) >= 2.0.0 +BuildRequires: pkgconfig(lalinspiral) >= 3.0.0 +BuildRequires: pkgconfig(lalmetaio) >= 3.0.0 +BuildRequires: pkgconfig(lalsimulation) >= 4.0.0 +# SECTION For tests +%if %{with test} +BuildRequires: %{python_module Shapely} +BuildRequires: %{python_module astropy} +BuildRequires: %{python_module glue >= 1.54.1} BuildRequires: %{python_module h5py} BuildRequires: %{python_module healpy >= 1.9.1} +BuildRequires: %{python_module lal >= 7.2.0} +BuildRequires: %{python_module lalburst >= 1.6.0} +BuildRequires: %{python_module lalframe >= 2.0.0} +BuildRequires: %{python_module lalinspiral >= 3.0.0} +BuildRequires: %{python_module lalmetaio >= 3.0.0} +BuildRequires: %{python_module lalsimulation >= 4.0.0} +BuildRequires: %{python_module matplotlib >= 1.2.0} +BuildRequires: %{python_module numpy} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module scipy >= 0.9.0} +BuildRequires: pkgconfig(lalinference) = %{version} +%endif # /SECTION %if %{with octave} BuildRequires: octave-lal -BuildRequires: octave-lalburst BuildRequires: octave-lalframe BuildRequires: octave-lalinspiral BuildRequires: octave-lalmetaio @@ -80,12 +88,12 @@ BuildRequires: pkgconfig(octave) %endif Requires: %{name}-data = %{version} -Requires: python-lal -Requires: python-lalframe -Requires: python-lalinspiral -Requires: python-lalmetaio -Requires: python-lalpulsar -Requires: python-lalsimulation +Requires: python-lal >= 7.2.0 +Requires: python-lalburst >= 1.6.0 +Requires: python-lalframe >= 2.0.0 +Requires: python-lalinspiral >= 3.0.0 +Requires: python-lalmetaio >= 3.0.0 +Requires: python-lalsimulation >= 4.0.0 ExcludeArch: %{ix86} %python_subpackages @@ -108,14 +116,12 @@ Requires: %{name}-data = %{version} Requires: %{shlib} = %{version} Requires: pkgconfig(gsl) -Requires: pkgconfig(lal) -Requires: pkgconfig(lalburst) -Requires: pkgconfig(lalframe) -Requires: pkgconfig(lalinspiral) -Requires: pkgconfig(lalmetaio) -Requires: pkgconfig(lalpulsar) -Requires: pkgconfig(lalsimulation) -Requires: pkgconfig(libmetaio) +Requires: pkgconfig(lal) >= 7.2.0 +Requires: pkgconfig(lalburst) >= 1.6.0 +Requires: pkgconfig(lalframe) >= 2.0.0 +Requires: pkgconfig(lalinspiral) >= 3.0.0 +Requires: pkgconfig(lalmetaio) >= 3.0.0 +Requires: pkgconfig(lalsimulation) >= 4.0.0 %description -n %{name}-devel This package contains sources and header files needed to build applications @@ -125,6 +131,7 @@ Summary: Data files for lalinference Group: Productivity/Scientific/Physics Provides: %{python_module lalinference-data} +BuildArch: noarch %description -n %{name}-data This package provides the data files for lalinference. @@ -146,7 +153,7 @@ This package provides the necessary files for using LAL Inference with octave. %prep -%autosetup -p1 +%autosetup -p1 -n %{pname}-%{version} %build %{python_expand # Necessary to run %%configure with all python flavors @@ -157,11 +164,12 @@ %configure \ %{?with_octave:--enable-swig-octave} \ %{!?with_octave:--disable-swig-octave} -make %{?_smp_mflags} +%make_build %{?with_test:test} popd } %install +%if %{without test} %{python_expand # install for all python flavors export PYTHON=%{_bindir}/$python pushd ../$python @@ -212,15 +220,6 @@ %python_expand %fdupes %{buildroot}%{$python_sitearch}/%{name}/ -%check -%{python_expand # check for all python flavors -export PYTHON=%{_bindir}/$python -pushd ../$python -export LD_LIBRARY_PATH=%{buildroot}%{_libdir} -%make_build check -popd -} - %post -n %{shlib} -p /sbin/ldconfig %postun -n %{shlib} -p /sbin/ldconfig @@ -252,4 +251,14 @@ %files -n %{name}-data %{_datadir}/%{name}/ +%else + +%check +%{python_expand # check for all python flavors +export PYTHON=%{_bindir}/$python +%make_build -C ../$python check +} + +%endif + %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild> ++++++ lalinference-3.0.1.tar.xz -> lalinference-4.0.0.tar.xz ++++++ ++++ 9092 lines of diff (skipped)