From 4b47c06869d9e07fb422d30493ccc21eaa00294cb80a45545d755b7993f53fc3 Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Tue, 23 Aug 2022 20:45:36 +0000
Subject: [PATCH] Accepting request 998346 from
 home:badshah400:branches:science

- Update to version 4.0.0:
  * No release notes.
- Update source URL.
- Change python build dir names so that the env var PYTHON can be
  set to the full python exec.
- Bump so version to match upstream.

OBS-URL: https://build.opensuse.org/request/show/998346
OBS-URL: https://build.opensuse.org/package/show/science/lalsimulation?expand=0&rev=14
---
 lalsimulation-3.1.0.tar.xz |  3 ---
 lalsimulation-4.0.0.tar.xz |  3 +++
 lalsimulation.changes      | 10 ++++++++++
 lalsimulation.spec         | 32 ++++++++++++++++----------------
 4 files changed, 29 insertions(+), 19 deletions(-)
 delete mode 100644 lalsimulation-3.1.0.tar.xz
 create mode 100644 lalsimulation-4.0.0.tar.xz

diff --git a/lalsimulation-3.1.0.tar.xz b/lalsimulation-3.1.0.tar.xz
deleted file mode 100644
index f128fa9..0000000
--- a/lalsimulation-3.1.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9be82007eedec1a85de89faffd85e03c7893356da1dda1a27de572f015f63e26
-size 7458540
diff --git a/lalsimulation-4.0.0.tar.xz b/lalsimulation-4.0.0.tar.xz
new file mode 100644
index 0000000..d3c983a
--- /dev/null
+++ b/lalsimulation-4.0.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4096a31f70450e6d5909a5e1147b779169852887d55b806c8b859f87983f20d7
+size 7471768
diff --git a/lalsimulation.changes b/lalsimulation.changes
index ac25ffb..7985a9f 100644
--- a/lalsimulation.changes
+++ b/lalsimulation.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Aug 19 12:25:25 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 4.0.0:
+  * No release notes.
+- Update source URL.
+- Change python build dir names so that the env var PYTHON can be
+  set to the full python exec.
+- Bump so version to match upstream.
+
 -------------------------------------------------------------------
 Mon Jan  3 00:30:32 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
 
diff --git a/lalsimulation.spec b/lalsimulation.spec
index f0ab0b4..c6ffb63 100644
--- a/lalsimulation.spec
+++ b/lalsimulation.spec
@@ -21,18 +21,18 @@
 # Py2 support dropped upstream
 %define skip_python2 1
 
-%define shlib liblalsimulation29
+%define shlib liblalsimulation31
 # octave >= 6 not supported
 %bcond_with octave
 Name:           lalsimulation
-Version:        3.1.0
+Version:        4.0.0
 Release:        0
 Summary:        LSC Algorithm Simulation Library
 License:        GPL-2.0-only
 URL:            https://wiki.ligo.org/Computing/DASWG/LALSuite
-Source:         http://software.ligo.org/lscsoft/source/lalsuite/lalsimulation-%{version}.tar.xz
+Source:         https://software.igwn.org/sources/source/lalsuite/%{name}-%{version}.tar.xz
 BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module lal >= 7.1.0}
+BuildRequires:  %{python_module lal >= 7.2.0}
 BuildRequires:  %{python_module numpy >= 1.7}
 BuildRequires:  %{python_module numpy-devel >= 1.7}
 BuildRequires:  fdupes
@@ -44,16 +44,16 @@ BuildRequires:  python-xml
 %endif
 BuildRequires:  swig >= 3.0.10
 BuildRequires:  pkgconfig(gsl)
-BuildRequires:  pkgconfig(lal) >= 7.1.0
+BuildRequires:  pkgconfig(lal) >= 7.2.0
 BuildRequires:  pkgconfig(zlib)
 %if %{with octave}
-BuildRequires:  octave-lal >= 7.1.0
+BuildRequires:  octave-lal >= 7.2.0
 BuildRequires:  pkgconfig(octave)
 %endif
 # SECTION For tests
 BuildRequires:  %{python_module pytest}
 # /SECTION
-Requires:       python-lal >= 7.1.0
+Requires:       python-lal >= 7.2.0
 Requires:       python-numpy >= 1.7
 # FOR PYTHON PACKAGE
 Requires:       lalsimulation-data = %{version}
@@ -77,7 +77,7 @@ Summary:        Headers and source files for building against LALSimulation
 Requires:       %{name}-data = %{version}
 Requires:       %{shlib} = %{version}
 Requires:       pkgconfig(gsl)
-Requires:       pkgconfig(lal)
+Requires:       pkgconfig(lal) >= 7.2.0
 Requires:       pkgconfig(zlib)
 
 %description -n %{name}-devel
@@ -104,10 +104,10 @@ This package provides the necessary files for using LALSimulation with octave.
 
 %build
 %{python_expand # Necessary to run configure with multiple py3 flavors
-export PYTHON=$python
-mkdir ../${PYTHON}_build
-cp -pr ./ ../${PYTHON}_build
-pushd ../${PYTHON}_build
+export PYTHON=%{_bindir}/$python
+mkdir ../$python
+cp -pr ./ ../$python
+pushd ../$python
 %configure \
   %{?with_octave:--enable-swig-octave} \
   %{!?with_octave:--disable-swig-octave}
@@ -117,8 +117,8 @@ popd
 
 %install
 %{python_expand # py2 and py3 make_install
-export PYTHON=$python
-pushd ../${PYTHON}_build
+export PYTHON=%{_bindir}/$python
+pushd ../$python
 %make_install
 popd
 }
@@ -158,8 +158,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %python_expand %fdupes %{buildroot}%{$python_sitearch}/%{name}/
 
 %check
-%{python_expand export PYTHON=$python
-pushd ../${PYTHON}_build
+%{python_expand export PYTHON=%{_bindir}/$python
+pushd ../$python
 %make_build check
 popd
 }