commit b05cc84564b530021e0254a82c6cc97eec15ce45
Author: Jakub Bogusz <[email protected]>
Date: Fri Jan 20 23:14:51 2023 +0100
- updated to 4.0.2 (new soname)
- added lal-swig patch (update lal/swig interface for lal 7.2.4)
lal-simulation-lal-swig.patch | 13 +++++++++++++
lal-simulation.spec | 38 +++++++++++++++++++++-----------------
2 files changed, 34 insertions(+), 17 deletions(-)
---
diff --git a/lal-simulation.spec b/lal-simulation.spec
index 05a9b8e..51b486c 100644
--- a/lal-simulation.spec
+++ b/lal-simulation.spec
@@ -5,33 +5,34 @@
Summary: LAL Simulation library
Summary(pl.UTF-8): Biblioteka LAL Simulation
Name: lal-simulation
-Version: 3.0.0
-Release: 3
+Version: 4.0.2
+Release: 1
License: GPL v2+
Group: Libraries
-Source0:
http://software.ligo.org/lscsoft/source/lalsuite/lalsimulation-%{version}.tar.xz
-# Source0-md5: 1790f203ca631fa93dc69bddcd19d055
+Source0:
http://software.igwn.org/lscsoft/source/lalsuite/lalsimulation-%{version}.tar.xz
+# Source0-md5: 0ec4c5f3c1392ad687a26a7a2f91d6b5
Patch0: %{name}-env.patch
Patch1: no-Werror.patch
-URL: https://wiki.ligo.org/DASWG/LALSuite
+Patch2: %{name}-lal-swig.patch
+URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
BuildRequires: gsl-devel >= 1.13
-BuildRequires: lal-devel >= 6.18.0
+BuildRequires: lal-devel >= 7.2.2
%{?with_openmp:BuildRequires: libgomp-devel}
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2
BuildRequires: octave-devel >= 1:3.2.0
BuildRequires: pkgconfig
-BuildRequires: python3-devel
-BuildRequires: python3-numpy-devel
-BuildRequires: swig >= 3.0.12
-BuildRequires: swig-python >= 2.0.12
+BuildRequires: python3-devel >= 1:3.5
+BuildRequires: python3-numpy-devel >= 1:1.7
+BuildRequires: swig >= 4.1.0
+BuildRequires: swig-python >= 3.0.11
BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildRequires: zlib-devel
Requires: gsl >= 1.13
-Requires: lal >= 6.18.0
+Requires: lal >= 7.2.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -45,7 +46,7 @@ Summary: Header files for lal-simulation library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki lal-simulation
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: lal-devel >= 6.18.0
+Requires: lal-devel >= 7.2.2
%description devel
Header files for lal-simulation library.
@@ -70,7 +71,7 @@ Summary: Octave interface for LAL Simulation
Summary(pl.UTF-8): Interfejs Octave do biblioteki LAL Simulation
Group: Applications/Math
Requires: %{name} = %{version}-%{release}
-Requires: octave-lal >= 6.18.0
+Requires: octave-lal >= 7.2.2
%description -n octave-lalsimulation
Octave interface for LAL Simulation.
@@ -83,8 +84,8 @@ Summary: Python bindings for LAL Simulation
Summary(pl.UTF-8): Wiązania Pythona do biblioteki LAL Simulation
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
-Requires: python3-lal >= 6.18.0
-Requires: python3-modules >= 1:2.6
+Requires: python3-lal >= 7.2.2
+Requires: python3-modules >= 1:3.5
%description -n python3-lalsimulation
Python bindings for LAL Simulation.
@@ -96,6 +97,7 @@ Wiązania Pythona do biblioteki LAL Simulation.
%setup -q -n lalsimulation-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -105,8 +107,10 @@ Wiązania Pythona do biblioteki LAL Simulation.
%{__automake}
%configure \
%{!?with_openmp:--disable-openmp} \
+ --disable-silent-rules \
--enable-swig
-%{__make} V=1
+
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -134,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/lalsim-*
%attr(755,root,root) %{_bindir}/lalsimulation_version
%attr(755,root,root) %{_libdir}/liblalsimulation.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblalsimulation.so.29
+%attr(755,root,root) %ghost %{_libdir}/liblalsimulation.so.31
%{_datadir}/lalsimulation
/etc/shrc.d/lalsimulation-user-env.csh
/etc/shrc.d/lalsimulation-user-env.fish
diff --git a/lal-simulation-lal-swig.patch b/lal-simulation-lal-swig.patch
new file mode 100644
index 0000000..7e89391
--- /dev/null
+++ b/lal-simulation-lal-swig.patch
@@ -0,0 +1,13 @@
+--- lalsimulation-4.0.2/lib/LALSimSphHarmSeries.h.orig 2022-05-11
00:56:41.962040955 +0200
++++ lalsimulation-4.0.2/lib/LALSimSphHarmSeries.h 2023-01-20
21:58:48.535057665 +0100
+@@ -96,8 +96,8 @@ void XLALDestroySphHarmPolarTimeSeries(S
+ 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);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lal-simulation.git/commitdiff/b05cc84564b530021e0254a82c6cc97eec15ce45
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
