From 4db934edfeff827221a33e8e90bf99e4de7ec19c12b45befd3393469ab09503f Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 29 Nov 2022 14:53:35 +0000 Subject: [PATCH 1/3] Accepting request 1038792 from home:badshah400:lal-swig41 Add swig_4_1_compat.patch: Ensure compatibility with swig 4.1; patch taken from upstream. OBS-URL: https://build.opensuse.org/request/show/1038792 OBS-URL: https://build.opensuse.org/package/show/science/lalsimulation?expand=0&rev=16 --- lalsimulation.changes | 6 ++++++ lalsimulation.spec | 4 +++- swig_4_1_compat.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 swig_4_1_compat.patch diff --git a/lalsimulation.changes b/lalsimulation.changes index 7985a9f..f93739a 100644 --- a/lalsimulation.changes +++ b/lalsimulation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 28 05:49:17 UTC 2022 - Atri Bhattacharya + +- Add swig_4_1_compat.patch: Ensure compatibility with swig 4.1; + patch taken from upstream. + ------------------------------------------------------------------- Fri Aug 19 12:25:25 UTC 2022 - Atri Bhattacharya diff --git a/lalsimulation.spec b/lalsimulation.spec index c6ffb63..66473a3 100644 --- a/lalsimulation.spec +++ b/lalsimulation.spec @@ -31,6 +31,8 @@ Summary: LSC Algorithm Simulation Library License: GPL-2.0-only URL: https://wiki.ligo.org/Computing/DASWG/LALSuite Source: https://software.igwn.org/sources/source/lalsuite/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM swig_4_1_compat.patch badshah40@gmail.com -- Ensure compatibility with swig 4.1; patch taken from upstream +Patch0: https://git.ligo.org/lscsoft/lalsuite/-/commit/17bdccd92ab76abfe617e3eb38edf85ab4dfe424.patch#/swig_4_1_compat.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module lal >= 7.2.0} BuildRequires: %{python_module numpy >= 1.7} @@ -100,7 +102,7 @@ Requires: octave-lal This package provides the necessary files for using LALSimulation with octave. %prep -%autosetup -p1 +%autosetup -p2 %build %{python_expand # Necessary to run configure with multiple py3 flavors diff --git a/swig_4_1_compat.patch b/swig_4_1_compat.patch new file mode 100644 index 0000000..c9d0e0e --- /dev/null +++ b/swig_4_1_compat.patch @@ -0,0 +1,28 @@ +From 17bdccd92ab76abfe617e3eb38edf85ab4dfe424 Mon Sep 17 00:00:00 2001 +From: Karl Wette +Date: Sat, 26 Nov 2022 14:35:05 +1100 +Subject: [PATCH] lalsimulation/lib/LALSimSphHarmSeries.h: fix misspelled SWIG + directive + +--- + lalsimulation/lib/LALSimSphHarmSeries.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lalsimulation/lib/LALSimSphHarmSeries.h b/lalsimulation/lib/LALSimSphHarmSeries.h +index 1bf7b239d9..9ee6b7ba01 100644 +--- a/lalsimulation/lib/LALSimSphHarmSeries.h ++++ b/lalsimulation/lib/LALSimSphHarmSeries.h +@@ -96,8 +96,8 @@ void XLALDestroySphHarmPolarTimeSeries(SphHarmPolarTimeSeries* ts); + UINT4 XLALSphHarmPolarTimeSeriesGetMaxL(SphHarmPolarTimeSeries* ts); + + #ifdef SWIG +-SWIGLAL(OWNED_BY_1ST_ARG(REAL8TimeSeries*, XLALSphHarmPolarTimeSeriesGetModeAmplitude)); +-SWIGLAL(OWNED_BY_1ST_ARG(REAL8TimeSeries*, XLALSphHarmPolarTimeSeriesGetModePhase)); ++SWIGLAL(RETURN_OWNED_BY_1ST_ARG(REAL8TimeSeries*, XLALSphHarmPolarTimeSeriesGetModeAmplitude)); ++SWIGLAL(RETURN_OWNED_BY_1ST_ARG(REAL8TimeSeries*, XLALSphHarmPolarTimeSeriesGetModePhase)); + #endif + + REAL8TimeSeries* XLALSphHarmPolarTimeSeriesGetModeAmplitude(SphHarmPolarTimeSeries *ts, UINT4 l, INT4 m); +-- +GitLab + From de0c2cb70795c41ec56630c956301f0e2a44e0ad864f9add0fdf1aaed09472de Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 29 Nov 2022 14:54:12 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/science/lalsimulation?expand=0&rev=17 --- lalsimulation.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lalsimulation.spec b/lalsimulation.spec index 66473a3..b49d7ae 100644 --- a/lalsimulation.spec +++ b/lalsimulation.spec @@ -87,6 +87,7 @@ This package provides the header and sources for coding against LALSimulation. %package -n %{name}-data Summary: Data files required for analyses using lalsimulation +BuildArch: noarch %description -n %{name}-data This package provides the data files used when running analyses involving From 59afaa489a1b99dfef55759e98aa841c25b60ae3ba629c12361c23c1b4c054b9 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 29 Nov 2022 14:54:46 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/science/lalsimulation?expand=0&rev=18 --- lalsimulation.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/lalsimulation.changes b/lalsimulation.changes index f93739a..d944a22 100644 --- a/lalsimulation.changes +++ b/lalsimulation.changes @@ -3,6 +3,7 @@ Mon Nov 28 05:49:17 UTC 2022 - Atri Bhattacharya - Add swig_4_1_compat.patch: Ensure compatibility with swig 4.1; patch taken from upstream. +- Make %{name}-data package noarch. ------------------------------------------------------------------- Fri Aug 19 12:25:25 UTC 2022 - Atri Bhattacharya