Accepting request 1038918 from science

- Add swig_4_1_compat.patch: Ensure compatibility with swig 4.1; patch taken from upstream.
- Make %{name}-data package noarch.

OBS-URL: https://build.opensuse.org/request/show/1038918
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lalsimulation?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2022-11-30 14:00:01 +00:00 committed by Git OBS Bridge
commit 9208c70274
3 changed files with 39 additions and 1 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 28 05:49:17 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
- 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 <badshah400@gmail.com>

View File

@ -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}
@ -85,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
@ -100,7 +103,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

28
swig_4_1_compat.patch Normal file
View File

@ -0,0 +1,28 @@
From 17bdccd92ab76abfe617e3eb38edf85ab4dfe424 Mon Sep 17 00:00:00 2001
From: Karl Wette <karl.wette@ligo.org>
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