Accepting request 871644 from science
OBS-URL: https://build.opensuse.org/request/show/871644 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lal?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
7dc48e1654
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:83a92377285ca0a2e6e48ae5ef8ad96a15dde62dc919f85ae93512dc942f860f
|
||||
size 1713536
|
||||
3
lal-7.1.1.tar.xz
Normal file
3
lal-7.1.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:97905d5da27c62c7e153db49825e23cafd53fd295659313829dd6110d820b316
|
||||
size 2326424
|
||||
@ -1,13 +0,0 @@
|
||||
Index: lal-6.22.0/lib/std/XLALError.h
|
||||
===================================================================
|
||||
--- lal-6.22.0.orig/lib/std/XLALError.h
|
||||
+++ lal-6.22.0/lib/std/XLALError.h
|
||||
@@ -698,7 +698,7 @@ void XLALError(const char *func,
|
||||
* <li> \b ... (Optional) Additional arguments for printf-like format.
|
||||
* </ul>
|
||||
*/
|
||||
-#define XLAL_ERROR(...) _XLAL_ERROR_IMPL_(return XLAL_FAILURE, __VA_ARGS__)
|
||||
+#define XLAL_ERROR(...) _XLAL_ERROR_IMPL_(return (LALTYPECODE)XLAL_FAILURE, __VA_ARGS__)
|
||||
|
||||
/**
|
||||
* Macro to invoke a failure from a XLAL routine returning a pointer.
|
||||
42
lal.changes
42
lal.changes
@ -1,3 +1,45 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 12 20:32:18 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
- Update to 7.1.1
|
||||
* no release notes
|
||||
- Skip python36 build. Due to NEP 29, python36-numpy and scipy in
|
||||
TW are no more.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 21 22:58:57 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Recommend rather than require python-ligo-lw and
|
||||
python-ligo-segments to avoid circular dependencies (these pkgs
|
||||
also require lal).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 18 21:09:11 UTC 2021 - Benjamin Greiner <code@bnavigator.de>
|
||||
|
||||
- Fix the test suite setup to actually call the tests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 18 13:49:55 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Drop lscsoft-glue BuildRequires: no longer required and prevents
|
||||
circular dependency with lscsoft-glue which indeed needs lal for
|
||||
its tests.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 21 22:11:03 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 7.1.0:
|
||||
* No release notes.
|
||||
- Drop lal-implicit-conversion-XLALError.patch: fixed properly
|
||||
upstream.
|
||||
- Add BuildRequires: python3-ligo-lw, needed for new tests.
|
||||
- Disable octave bindings: does not support octave >= 6.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 30 09:52:37 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Build without octave bindings on Leap 15.x, requires SWIG 4.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 25 17:56:07 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
42
lal.spec
42
lal.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package lal
|
||||
#
|
||||
# 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,21 +16,23 @@
|
||||
#
|
||||
|
||||
|
||||
# NEP 29: numpy, scipy do not have a python36 flavor package in TW
|
||||
%define skip_python36 1
|
||||
|
||||
%define shliblal liblal20
|
||||
%define shliblalsupport liblalsupport14
|
||||
%bcond_without octave
|
||||
|
||||
# No support for octave >= 6
|
||||
%bcond_with octave
|
||||
Name: lal
|
||||
Version: 7.0.0
|
||||
Version: 7.1.1
|
||||
Release: 0
|
||||
Summary: A collection of various gravitational wave data analysis routines
|
||||
License: GPL-2.0-only
|
||||
Group: Productivity/Scientific/Physics
|
||||
URL: https://wiki.ligo.org/Computing/LALSuite
|
||||
Source: http://software.ligo.org/lscsoft/source/lalsuite/lal-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM lal-implicit-conversion-XLALError.patch badshah400@gmail.com -- Fix an implicit coversion issue flagged by GCC 10
|
||||
Patch0: lal-implicit-conversion-XLALError.patch
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module lscsoft-glue}
|
||||
BuildRequires: %{python_module numpy-devel}
|
||||
BuildRequires: %{python_module numpy}
|
||||
BuildRequires: %{python_module six}
|
||||
@ -40,23 +42,26 @@ BuildRequires: fdupes
|
||||
BuildRequires: hdf5-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: swig >= 4.0
|
||||
BuildRequires: pkgconfig(fftw3)
|
||||
BuildRequires: pkgconfig(gsl)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
Requires: python-freezegun
|
||||
Requires: python-ligo-segments
|
||||
Requires: python-lscsoft-glue
|
||||
Requires: python-numpy
|
||||
Requires: python-python-dateutil
|
||||
Requires: python-scipy
|
||||
Requires: python-six
|
||||
Recommends: python-ligo-lw
|
||||
Recommends: python-ligo-segments
|
||||
ExcludeArch: %{ix86}
|
||||
%if %{with octave}
|
||||
BuildRequires: octave-devel
|
||||
BuildRequires: swig >= 4.0
|
||||
%else
|
||||
BuildRequires: swig >= 3.0
|
||||
%endif
|
||||
# SECTION For tests (only with python3)
|
||||
# SECTION For tests (only the default python3 flavor)
|
||||
BuildRequires: python3-freezegun
|
||||
BuildRequires: python3-ligo-lw
|
||||
BuildRequires: python3-ligo-segments
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-python-dateutil
|
||||
@ -124,7 +129,7 @@ This package provides the octave module for lal.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%{python_expand # Necessary to run %%configure with both py2 and py3
|
||||
%{python_expand # Necessary to run %%configure with all python flavors
|
||||
export PYTHON=$python
|
||||
mkdir ../${PYTHON}_build
|
||||
cp -pr ./ ../${PYTHON}_build
|
||||
@ -137,7 +142,7 @@ popd
|
||||
}
|
||||
|
||||
%install
|
||||
%{python_expand # py2 and py3 make_install
|
||||
%{python_expand # all python flavors as configured above
|
||||
export PYTHON=$python
|
||||
pushd ../${PYTHON}_build
|
||||
%make_install
|
||||
@ -156,14 +161,17 @@ sed -Ei "1{/^#!\/usr\/bin\/env python/d}" %{buildroot}%{$python_sitearch}/lal/gp
|
||||
sed -Ei "1{/^#!\/usr\/bin\/env python/d}" %{buildroot}%{$python_sitearch}/lal/series.py
|
||||
sed -Ei "1{/^#!\/usr\/bin\/env python/d}" %{buildroot}%{$python_sitearch}/lal/antenna.py
|
||||
}
|
||||
%{?python_compileall}
|
||||
|
||||
%ifpython3
|
||||
%check
|
||||
# Run tests from the python3 build dir
|
||||
pushd ../python3_build
|
||||
%{python_expand # Run tests from the build dir of the primary python3 flavor only
|
||||
if [ "$python_" = "python3_" -o "%{$python_provides}" = "python3" ]; then
|
||||
export PYTHON=$python
|
||||
pushd ../${PYTHON}_build
|
||||
%make_build check
|
||||
popd
|
||||
%endif
|
||||
fi
|
||||
}
|
||||
|
||||
%post -n %{shliblal} -p /sbin/ldconfig
|
||||
%post -n %{shliblalsupport} -p /sbin/ldconfig
|
||||
@ -171,7 +179,7 @@ popd
|
||||
%postun -n %{shliblalsupport} -p /sbin/ldconfig
|
||||
|
||||
%files %{python_files}
|
||||
%{python_sitearch}/*
|
||||
%{python_sitearch}/lal
|
||||
|
||||
%files -n %{shliblal}
|
||||
%{_libdir}/liblal.so.*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user