[packages/lal-xml] - added octave patch (fix install dir); release 7

[qboosh]

commit 7018a1daa148e709d671f80d2c1984dfd6cd387b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jan 23 18:21:03 2023 +0100

    - added octave patch (fix install dir); release 7

 lal-xml-octave.patch | 16 ++++++++++++++++
 lal-xml.spec         | 12 ++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/lal-xml.spec b/lal-xml.spec
index fa5d044..50a0f09 100644
--- a/lal-xml.spec
+++ b/lal-xml.spec
@@ -2,13 +2,14 @@ Summary:	LAL wrapping of the XML library
 Summary(pl.UTF-8):	Obudowanie LAL do biblioteki XML
 Name:		lal-xml
 Version:	1.2.4
-Release:	6
+Release:	7
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://software.ligo.org/lscsoft/source/lalsuite/lalxml-%{version}.tar.xz
+Source0:	http://software.igwn.org/lscsoft/source/lalsuite/lalxml-%{version}.tar.xz
 # Source0-md5:	8890f9630f59a5cc9e9c32df29f5da5c
 Patch0:		%{name}-env.patch
-URL:		https://wiki.ligo.org/DASWG/LALSuite
+Patch1:		%{name}-octave.patch
+URL:		https://wiki.ligo.org/Computing/LALSuite
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	gsl-devel >= 1.13
@@ -20,7 +21,7 @@ BuildRequires:	octave-devel >= 1:3.2.0
 BuildRequires:	pkgconfig
 BuildRequires:	python3-devel
 BuildRequires:	python3-numpy-devel
-BuildRequires:	swig >= 3.0.12
+BuildRequires:	swig >= 4.1.0
 BuildRequires:	swig-python >= 2.0.12
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -83,6 +84,7 @@ Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
 Requires:	python3-lal >= 6.18.0
 Requires:	python3-modules >= 1:2.6
+Obsoletes:	python-lalxml < 1.2.4-4
 
 %description -n python3-lalxml
 Python bindings for LAL XML.
@@ -93,6 +95,7 @@ Wiązania Pythona do biblioteki LAL XML.
 %prep
 %setup -q -n lalxml-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -103,6 +106,7 @@ Wiązania Pythona do biblioteki LAL XML.
 %configure \
 	PYTHON=%{__python3} \
 	--disable-dependency-tracking \
+	--disable-silent-rules \
 	--enable-swig
 %{__make}
 
diff --git a/lal-xml-octave.patch b/lal-xml-octave.patch
new file mode 100644
index 0000000..c94ceb2
--- /dev/null
+++ b/lal-xml-octave.patch
@@ -0,0 +1,16 @@
+--- lalxml-1.2.4/gnuscripts/lalsuite_swig.m4.orig	2017-02-03 20:39:20.000000000 +0100
++++ lalxml-1.2.4/gnuscripts/lalsuite_swig.m4	2023-01-23 06:21:14.412763138 +0100
+@@ -280,13 +280,7 @@ AC_DEFUN([LALSUITE_USE_SWIG_OCTAVE],[
+     # is installed in the same directory as Octave, .oct files will be found by
+     # Octave without having to add to OCTAVE_PATH
+     AC_MSG_CHECKING([${OCTAVE} .oct installation directory])
+-    octave_prefix=[`${octave_cfg} -p PREFIX 2>/dev/null | ${SED} -e 's|/*$||'`]
+     octexecdir=[`${octave_cfg} -p LOCALVEROCTFILEDIR 2>/dev/null | ${SED} -e 's|/*$||'`]
+-    octexecdir=[`echo ${octexecdir} | ${SED} -e "s|^${octave_prefix}/||"`]
+-    AS_IF([test "x`echo ${octexecdir} | ${SED} -n -e '\|^/|p'`" != x],[
+-      AC_MSG_ERROR([could not build relative path from "${octexecdir}"])
+-    ])
+-    octexecdir='${prefix}'/"${octexecdir}"
+     AC_MSG_RESULT([${octexecdir}])
+     AC_SUBST([octexecdir])
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lal-xml.git/commitdiff/7018a1daa148e709d671f80d2c1984dfd6cd387b