diff --git a/lalsimulation-4.0.0.tar.xz b/lalsimulation-4.0.0.tar.xz deleted file mode 100644 index d3c983a..0000000 --- a/lalsimulation-4.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4096a31f70450e6d5909a5e1147b779169852887d55b806c8b859f87983f20d7 -size 7471768 diff --git a/lalsimulation-5.2.0.tar.xz b/lalsimulation-5.2.0.tar.xz new file mode 100644 index 0000000..907712c --- /dev/null +++ b/lalsimulation-5.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b359a8d5d8722c549275f02b7148c6174c2d5c17f609a1b0f9c00ce18191aaa +size 7638540 diff --git a/lalsimulation.changes b/lalsimulation.changes index f3b0f09..4342cf2 100644 --- a/lalsimulation.changes +++ b/lalsimulation.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue May 23 08:02:55 UTC 2023 - Atri Bhattacharya + +- Update to version 5.2.0: + * No release notes. +- Drop swig_4_1_compat.patch: incorporated upstream. +- Pass -Wno-error=enum-int-mismatch to CFLAGS to avoid build + failures on a trivial type redefinition issue (communicated to + upstream via email). +- Update shlib package name in keeping with upstream so version. + ------------------------------------------------------------------- Sun Feb 12 05:53:50 UTC 2023 - Atri Bhattacharya diff --git a/lalsimulation.spec b/lalsimulation.spec index ba62206..31feb5c 100644 --- a/lalsimulation.spec +++ b/lalsimulation.spec @@ -21,18 +21,16 @@ # Py2 support dropped upstream %define skip_python2 1 -%define shlib liblalsimulation31 +%define shlib liblalsimulation32 # octave >= 6 not supported %bcond_with octave Name: lalsimulation -Version: 4.0.0 +Version: 5.2.0 Release: 0 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} @@ -113,6 +111,8 @@ export PYTHON=%{_bindir}/$python mkdir ../$python cp -pr ./ ../$python pushd ../$python +export CFLAGS="%{optflags} -Wno-error=enum-int-mismatch" +export CXXFLAGS=$CFLAGS %configure \ %{?with_octave:--enable-swig-octave} \ %{!?with_octave:--disable-swig-octave} diff --git a/swig_4_1_compat.patch b/swig_4_1_compat.patch deleted file mode 100644 index c9d0e0e..0000000 --- a/swig_4_1_compat.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 -