Accepting request 861890 from home:badshah400:branches:science

- Update to version 7.1.0.
- 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.

OBS-URL: https://build.opensuse.org/request/show/861890
OBS-URL: https://build.opensuse.org/package/show/science/lal?expand=0&rev=10

lal-7.0.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83a92377285ca0a2e6e48ae5ef8ad96a15dde62dc919f85ae93512dc942f860f
-size 1713536

lal-7.1.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81f1df34b178893483c7ed4262d1ffe98be6110c94f94a4ba8a405f62dd349e9
+size 2321872

lal-implicit-conversion-XLALError.patch

@@ -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.

lal.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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>
 

lal.spec

@@ -18,21 +18,17 @@
 
 %define shliblal liblal20
 %define shliblalsupport liblalsupport14
-%if 0%{suse_version} >= 1550
-%bcond_without octave
-%else
-%bcond_with    octave
-%endif
+
+# No support for octave >= 6
+%bcond_with octave
 Name:           lal
-Version:        7.0.0
+Version:        7.1.0
 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}
@@ -64,6 +60,7 @@ BuildRequires:  swig >= 3.0
 %endif
 # SECTION For tests (only with python3)
 BuildRequires:  python3-freezegun
+BuildRequires:  python3-ligo-lw
 BuildRequires:  python3-ligo-segments
 BuildRequires:  python3-pytest
 BuildRequires:  python3-python-dateutil