[packages/lal-detchar] - added lal-swig,octave patches (adjust to swig types from lal 7.2.x, fix octave install dir) - disa

qboosh qboosh at pld-linux.org
Sun Jan 22 21:46:56 CET 2023 

commit 7d395b5a76750851b69b9c1b66a24a0ccc09108d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 22 21:47:08 2023 +0100

    - added lal-swig,octave patches (adjust to swig types from lal 7.2.x, fix octave install dir)
    - disable python2 module by default (no longer fulfillable dependencies)
    - release 3

 lal-detchar-lal-swig.patch | 20 +++++++++++++++
 lal-detchar-octave.patch   | 16 ++++++++++++
 lal-detchar.spec           | 63 ++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 91 insertions(+), 8 deletions(-)
---
diff --git a/lal-detchar.spec b/lal-detchar.spec
index e277769..3053f74 100644
--- a/lal-detchar.spec
+++ b/lal-detchar.spec
@@ -1,19 +1,26 @@
+#
+# Conditional build
+%bcond_with	python	# Python 2.x module (dependencies obsolete)
+
 Summary:	LAL routines for detector chracterisation
 Summary(pl.UTF-8):	Procedury LAL do charakterystyki detektorów
 Name:		lal-detchar
 Version:	0.3.5
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://software.ligo.org/lscsoft/source/lalsuite/laldetchar-%{version}.tar.xz
+Source0:	http://software.igwn.org/lscsoft/source/lalsuite/laldetchar-%{version}.tar.xz
 # Source0-md5:	1a82ba51de4bad71e8d2b7d2bad6988d
 Patch0:		%{name}-env.patch
 Patch1:		lal-metaio-detect.patch
-URL:		https://wiki.ligo.org/DASWG/LALSuite
+Patch2:		%{name}-lal-swig.patch
+Patch3:		%{name}-octave.patch
+URL:		https://wiki.ligo.org/Computing/LALSuite
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	glib2-devel >= 2.0
 BuildRequires:	gsl-devel >= 1.13
+BuildRequires:	help2man
 BuildRequires:	lal-burst-devel >= 1.4.4
 BuildRequires:	lal-devel >= 6.18.0
 BuildRequires:	lal-metaio-devel >= 1.3.1
@@ -22,9 +29,11 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2
 BuildRequires:	octave-devel >= 1:3.2.0
 BuildRequires:	pkgconfig
+%if %{with python}
 BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	python-numpy-devel >= 1:1.7
-BuildRequires:	swig >= 3.0.12
+%endif
+BuildRequires:	swig >= 4.1.0
 BuildRequires:	swig-python >= 2.0.12
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -32,6 +41,9 @@ Requires:	lal >= 6.18.0
 Requires:	lal-burst >= 1.4.4
 Requires:	lal-metaio >= 1.3.1
 Requires:	lal-simulation >= 1.7.0
+%if %{without python}
+Obsoletes:	python-laldetchar < %{version}-%{release}
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -93,6 +105,7 @@ Requires:	python-lal >= 6.18.0
 Requires:	python-lalburst >= 1.4.4
 Requires:	python-lalmetaio >= 1.3.1
 Requires:	python-lalsimulation >= 1.7.0
+Requires:	python-lscsoft-glue
 Requires:	python-modules >= 1:2.6
 Requires:	python-matplotlib
 Requires:	python-numpy >= 1:1.7
@@ -100,8 +113,6 @@ Requires:	python-pygobject >= 2.0
 Requires:	python-pygtk-gtk >= 2:2.0
 Requires:	python-scipy
 #python-ROOT
-#python-glue (glue.gpstime glue.iterutils glue.ligolw glue.pipeline glue.segments glue.segmentUtils)
-#python-pylal
 
 %description -n python-laldetchar
 Python bindings for LAL DetChar.
@@ -113,6 +124,8 @@ Wiązania Pythona do biblioteki LAL DetChar.
 %setup -q -n laldetchar-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -121,8 +134,13 @@ Wiązania Pythona do biblioteki LAL DetChar.
 %{__autoheader}
 %{__automake}
 %configure \
+	PYTHON=%{__python} \
 	--disable-dependency-tracking \
-	--enable-swig
+	%{!?with_python:--disable-python} \
+	--disable-silent-rules \
+	--enable-swig \
+	%{!?with_python:--disable-swig-python}
+
 %{__make}
 
 %install
@@ -148,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README
+%attr(755,root,root) %{_bindir}/laldetchar-idq-append-file-to-cache
 %attr(755,root,root) %{_bindir}/laldetchar_version
 %attr(755,root,root) %{_libdir}/liblaldetchar.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblaldetchar.so.3
@@ -172,9 +191,36 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/octave/*/site/oct/*/laldetchar.oct
 
+%if %{with python}
 %files -n python-laldetchar
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/laldetchar-*
+%attr(755,root,root) %{_bindir}/laldetchar-hveto
+%attr(755,root,root) %{_bindir}/laldetchar-hveto-summary-page
+%attr(755,root,root) %{_bindir}/laldetchar-idq-add-excluded-vars
+%attr(755,root,root) %{_bindir}/laldetchar-idq-build-auxmvc-vectors
+%attr(755,root,root) %{_bindir}/laldetchar-idq-convertkwtosb
+%attr(755,root,root) %{_bindir}/laldetchar-idq-evaluate-times
+%attr(755,root,root) %{_bindir}/laldetchar-idq-calibration
+%attr(755,root,root) %{_bindir}/laldetchar-idq-gdb-alert-handler
+%attr(755,root,root) %{_bindir}/laldetchar-idq-gdb-glitch-tables
+%attr(755,root,root) %{_bindir}/laldetchar-idq-gdb-processor
+%attr(755,root,root) %{_bindir}/laldetchar-idq-gdb-timeseries
+%attr(755,root,root) %{_bindir}/laldetchar-idq-prepare-training-auxmvc-samples
+%attr(755,root,root) %{_bindir}/laldetchar-idq-realtime
+%attr(755,root,root) %{_bindir}/laldetchar-idq-select-channels-from-kw-config
+%attr(755,root,root) %{_bindir}/laldetchar-idq-summary
+%attr(755,root,root) %{_bindir}/laldetchar-idq-svm-evaluate
+%attr(755,root,root) %{_bindir}/laldetchar-idq-svm-train
+%attr(755,root,root) %{_bindir}/laldetchar-idq-train
+%attr(755,root,root) %{_bindir}/laldetchar-segments-from-data
+%attr(755,root,root) %{_bindir}/laldetchar-idq-ann-convert
+%attr(755,root,root) %{_bindir}/laldetchar-idq-ann-train
+%attr(755,root,root) %{_bindir}/laldetchar-idq-ann-evaluate
+%attr(755,root,root) %{_bindir}/laldetchar-idq-frames-to-segments
+%attr(755,root,root) %{_bindir}/laldetchar-idq-gst-sender
+%attr(755,root,root) %{_bindir}/laldetchar-idq-gst-relay
+%attr(755,root,root) %{_bindir}/laldetchar-idq-gst-listener
+%attr(755,root,root) %{_bindir}/laldetchar-idq-gdb-local-performance
 %dir %{py_sitedir}/laldetchar
 %attr(755,root,root) %{py_sitedir}/laldetchar/_laldetchar.so
 %{py_sitedir}/laldetchar/*.py[co]
@@ -182,3 +228,4 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/laldetchar/idq
 %{py_sitedir}/laldetchar/triggers
 %{_mandir}/man1/laldetchar-*.1*
+%endif
diff --git a/lal-detchar-lal-swig.patch b/lal-detchar-lal-swig.patch
new file mode 100644
index 0000000..d90e3f8
--- /dev/null
+++ b/lal-detchar-lal-swig.patch
@@ -0,0 +1,20 @@
+--- laldetchar-0.3.5/src/LALDetCharGlibTypes.h.orig	2023-01-22 20:51:02.734279401 +0100
++++ laldetchar-0.3.5/src/LALDetCharGlibTypes.h	2023-01-22 20:51:09.554242455 +0100
+@@ -48,7 +48,7 @@ size_t XLALGetGSequenceLength(LALGSequen
+ 
+ void XLALDestroyGSequenceIter(LALGSequenceIter* itr);
+ #ifdef SWIG   // SWIG interface directives
+-SWIGLAL(OWNED_BY_1ST_ARG(LALGSequenceIter*, XLALGSequenceBegin));
++SWIGLAL(RETURN_OWNED_BY_1ST_ARG(LALGSequenceIter*, XLALGSequenceBegin));
+ #endif
+ LALGSequenceIter* XLALGSequenceBegin(LALGSequence* seq);
+ bool XLALGSequenceNext(LALGSequenceIter* itr);
+@@ -57,7 +57,7 @@ GSequenceIter* XLALGSequenceBeginRaw(LAL
+ #endif
+ 
+ #ifdef SWIG   // SWIG interface directives
+-SWIGLAL(OWNED_BY_1ST_ARG(SnglBurst*, XLALGetGSeqSnglBurst));
++SWIGLAL(RETURN_OWNED_BY_1ST_ARG(SnglBurst*, XLALGetGSeqSnglBurst));
+ #endif
+ SnglBurst* XLALGetGSeqSnglBurst(LALGSequenceIter* itr);
+ #ifdef SWIG   // SWIG interface directives
diff --git a/lal-detchar-octave.patch b/lal-detchar-octave.patch
new file mode 100644
index 0000000..b935dfd
--- /dev/null
+++ b/lal-detchar-octave.patch
@@ -0,0 +1,16 @@
+--- laldetchar-0.3.5/gnuscripts/lalsuite_swig.m4.orig	2017-02-03 20:39:20.000000000 +0100
++++ laldetchar-0.3.5/gnuscripts/lalsuite_swig.m4	2023-01-22 21:22:01.314210610 +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-detchar.git/commitdiff/7d395b5a76750851b69b9c1b66a24a0ccc09108d

More information about the pld-cvs-commit mailing list