From 5087e72010cd6e1c70b264d1eca62b5182779d173d3733627bf24499d9044fce Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Sun, 14 Feb 2021 13:23:23 +0000
Subject: [PATCH] Accepting request 871649 from
 home:badshah400:branches:science

OBS-URL: https://build.opensuse.org/request/show/871649
OBS-URL: https://build.opensuse.org/package/show/science/lalframe?expand=0&rev=6
---
 lalframe-1.5.1.tar.xz |  3 ---
 lalframe-1.5.3.tar.xz |  3 +++
 lalframe.changes      | 21 +++++++++++++++++++++
 lalframe.spec         | 28 +++++++++++++++++-----------
 4 files changed, 41 insertions(+), 14 deletions(-)
 delete mode 100644 lalframe-1.5.1.tar.xz
 create mode 100644 lalframe-1.5.3.tar.xz

diff --git a/lalframe-1.5.1.tar.xz b/lalframe-1.5.1.tar.xz
deleted file mode 100644
index f992ebe..0000000
--- a/lalframe-1.5.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39604c2e012babf0a67322e71b91119206c41dd35eff8aaa0644aac932abe73d
-size 7341480
diff --git a/lalframe-1.5.3.tar.xz b/lalframe-1.5.3.tar.xz
new file mode 100644
index 0000000..1415808
--- /dev/null
+++ b/lalframe-1.5.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0300611e706d5ca09b85ed00b4714d671a1d67a429714b5618bce4dae042de6
+size 7385100
diff --git a/lalframe.changes b/lalframe.changes
index 835608a..45eecf1 100644
--- a/lalframe.changes
+++ b/lalframe.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Feb 12 19:04:34 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to version 1.5.3:
+  * No release notes.
+- Skip python36 build because python36-numpy in TW is no more 
+  (NEP29)
+
+-------------------------------------------------------------------
+Thu Jan 21 23:25:34 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Fix up dependency for tests and the %check section running the
+  tests for mutli-versioned python.
+
+-------------------------------------------------------------------
+Mon Dec 21 22:19:38 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 1.5.2:
+  * No release notes.
+- Disable octave bindings: octave >= 6 unsupported.
+
 -------------------------------------------------------------------
 Sun Oct 25 18:32:25 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
 
diff --git a/lalframe.spec b/lalframe.spec
index c145885..a27a874 100644
--- a/lalframe.spec
+++ b/lalframe.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lalframe
 #
-# 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,10 +16,13 @@
 #
 
 
+# NEP 29: python36-numpy and co. in TW are no more
+%define skip_python36 1
 %define shlib lib%{name}11
-%bcond_without octave
+# No support for octave >= 6
+%bcond_with octave
 Name:           lalframe
-Version:        1.5.1
+Version:        1.5.3
 Release:        0
 Summary:        LSC Algorithm Frame Library for gravitational wave data analysis
 License:        GPL-2.0-or-later
@@ -27,9 +30,9 @@ Group:          Productivity/Scientific/Physics
 URL:            https://wiki.ligo.org/Computing/LALSuite
 Source:         http://software.ligo.org/lscsoft/source/lalsuite/lalframe-%{version}.tar.xz
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module lal >= 6.21.0}
-BuildRequires:  %{python_module numpy-devel}
-BuildRequires:  %{python_module numpy}
+BuildRequires:  %{python_module lal >= 7.1.0}
+BuildRequires:  %{python_module numpy >= 1.7}
+BuildRequires:  %{python_module numpy-devel >= 1.7}
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
@@ -38,17 +41,18 @@ BuildRequires:  pkgconfig(framecppc)
 BuildRequires:  pkgconfig(framel)
 BuildRequires:  pkgconfig(lal) >= 6.21.0
 Requires:       python-lal
-Requires:       python-numpy
+Requires:       python-numpy >= 1.7
 ExcludeArch:    %{ix86}
 %if 0%{?suse_version} < 1550
 BuildRequires:  python-xml
 %endif
 %if %{with octave}
-BuildRequires:  octave-lal >= 6.21.0
+BuildRequires:  octave-lal >= 7.1.0
 BuildRequires:  pkgconfig(octave)
 %endif
 # SECTION For tests
-BuildRequires:  python3-pytest
+BuildRequires:  %{python_module ligo-segments}
+BuildRequires:  %{python_module pytest}
 # /SECTION
 %python_subpackages
 
@@ -143,10 +147,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %python_expand %fdupes %{buildroot}%{$python_sitearch}/%{name}/
 
-%ifpython3
 %check
+%{python_expand # check all flavors
+export PYTHON=$python
+pushd ../${PYTHON}_build
 %make_build check
-%endif
+}
 
 %post -n %{shlib} -p /sbin/ldconfig
 %postun -n %{shlib} -p /sbin/ldconfig