diff --git a/lal-7.2.4.tar.xz b/lal-7.2.4.tar.xz deleted file mode 100644 index aea5e21..0000000 --- a/lal-7.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e00d15216fca06b35b2b0c27fa360ed5042c700d5dd3eaf8f249957a1e199ccf -size 2372060 diff --git a/lal-7.3.1.tar.xz b/lal-7.3.1.tar.xz new file mode 100644 index 0000000..ad494b1 --- /dev/null +++ b/lal-7.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6aaf7ad079e29f0450f9525096e3938d7bcc72c4a62c242800bdb7d424a8d192 +size 2363108 diff --git a/lal.changes b/lal.changes index a3c4475..ab793ad 100644 --- a/lal.changes +++ b/lal.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri May 26 14:30:47 UTC 2023 - Atri Bhattacharya + +- Fix a couple of incorrect hashbangs on executable scripts. + +------------------------------------------------------------------- +Tue Apr 18 10:35:22 UTC 2023 - pgajdos@suse.com + +- version update to 7.3.1 + * no changelog found +- python-six is not required + https://trello.com/c/MO53MocR/143-remove-python3-six +- deleted patches + - replace_numpy_object.patch (upstreamed) + - swig_4_1_compat.patch (upstreamed) + ------------------------------------------------------------------- Sat Jan 28 06:06:33 UTC 2023 - Stefan BrĂ¼ns diff --git a/lal.spec b/lal.spec index 4ac096d..83c25bd 100644 --- a/lal.spec +++ b/lal.spec @@ -36,21 +36,16 @@ # No support for octave >= 6 %bcond_with octave Name: lal%{psuffix} -Version: 7.2.4 +Version: 7.3.1 Release: 0 Summary: A collection of various gravitational wave data analysis routines License: GPL-2.0-only Group: Productivity/Scientific/Physics URL: https://wiki.ligo.org/Computing/LALSuite Source: https://software.igwn.org/sources/source/lalsuite/lal-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -- See https://git.ligo.org/lscsoft/lalsuite/-/commit/847f9f1bf9c8e029db6426de098a963d542ab08b.patch -Patch0: swig_4_1_compat.patch -# PATCH-FIX-UPSTREAM -- https://git.ligo.org/lscsoft/lalsuite/-/commit/e4269307540b.patch -Patch1: replace_numpy_object.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module numpy} -BuildRequires: %{python_module six} BuildRequires: %{python_module xml} BuildRequires: bc BuildRequires: fdupes @@ -64,7 +59,6 @@ Requires: python-freezegun Requires: python-numpy Requires: python-python-dateutil Requires: python-scipy -Requires: python-six Recommends: python-ligo-lw Recommends: python-ligo-segments # Broken on all archs where 'char' is unsigned @@ -201,6 +195,9 @@ find %{buildroot}%{$python_sitearch} -iname \*pyc -type f \( -exec grep 'home/ab } %python_expand %fdupes %{buildroot}%{$python_sitearch}/ + +# Fix broken hashbang +sed -Ei "1{s|(python3\.?[0-9]*)|%{_bindir}/\1|}" %{buildroot}%{_bindir}/lal_{path2cache,searchsum2cache} %endif %check @@ -222,7 +219,7 @@ fi %postun -n %{shliblalsupport} -p /sbin/ldconfig %files %{python_files} -%{python_sitearch}/lal +%{python_sitearch}/lal/ %files -n %{shliblal} %{_libdir}/liblal.so.* @@ -238,6 +235,7 @@ fi %{_libdir}/liblal.so %{_libdir}/liblalsupport.so %{_libdir}/pkgconfig/*.pc +%{_mandir}/man7/*.7%{?ext_man} %if %{with octave} %files -n octave-lal diff --git a/replace_numpy_object.patch b/replace_numpy_object.patch deleted file mode 100644 index 561f311..0000000 --- a/replace_numpy_object.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e4269307540b77ffc015c7be54191cf3350c798b Mon Sep 17 00:00:00 2001 -From: "duncan.macleod" -Date: Tue, 10 Jan 2023 16:30:46 +0000 -Subject: [PATCH] lal: replace numpy.object with builtin object - -numpy.object was a deprecated alias to object, see -https://numpy.org/devdocs/release/1.20.0-notes.html#using-the-aliases-of-builtin-types-like-np-int-is-deprecated ---- - lal/swig/SWIGTestLALPython.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lal/swig/SWIGTestLALPython.py b/lal/swig/SWIGTestLALPython.py -index b634b2c3d7..661c6fecab 100644 ---- a/swig/SWIGTestLALPython.py -+++ b/swig/SWIGTestLALPython.py -@@ -135,7 +135,7 @@ def test_string_conversions(): - strs = ["a", "bc", "def"] - sv = lal.CreateStringVector(*strs) - assert sv.length == 3 --assert (sv.data.astype(numpy.object) == strs).all() -+assert (sv.data.astype(object) == strs).all() - strs[0] = "ghijk" - sv.data[0] = strs[0] - strs.append("lmnopq") --- -GitLab - diff --git a/swig_4_1_compat.patch b/swig_4_1_compat.patch deleted file mode 100644 index 592f647..0000000 --- a/swig_4_1_compat.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 847f9f1bf9c8e029db6426de098a963d542ab08b Mon Sep 17 00:00:00 2001 -From: Karl Wette -Date: Fri, 25 Nov 2022 17:15:19 +1100 -Subject: [PATCH] SWIG: compatibility with version 4.1.0 - -- -py3 is deprecated -- %typemaps_string_alloc() needs an extra argument ---- - gnuscripts/lalsuite_swig.m4 | 8 +++++++- - lal/swig/SWIGCommon.i | 8 ++++++++ - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/swig/SWIGCommon.i b/swig/SWIGCommon.i -index caf7d8f365..bb6dc62e6e 100644 ---- a/swig/SWIGCommon.i -+++ b/swig/SWIGCommon.i -@@ -1809,10 +1809,18 @@ if (strides[I-1] == 0) { - return res; - } - } -+#if SWIG_VERSION >= 0x040100 -+%typemaps_string_alloc(%checkcode(STRING), %checkcode(char), -+ SWIGWARN_TYPEMAP_CHARLEAK_MSG, char, LALchar, -+ SWIG_AsLALcharPtrAndSize, SWIG_FromLALcharPtrAndSize, -+ strlen, SWIG_strnlen, %swiglal_new_copy_array, XLALFree, -+ "", CHAR_MIN, CHAR_MAX); -+#else - %typemaps_string_alloc(%checkcode(STRING), %checkcode(char), char, LALchar, - SWIG_AsLALcharPtrAndSize, SWIG_FromLALcharPtrAndSize, - strlen, SWIG_strnlen, %swiglal_new_copy_array, XLALFree, - "", CHAR_MIN, CHAR_MAX); -+#endif - - /// - /// Typemaps for string pointers. By default, treat arguments of type char** as output-only --- -GitLab -