commit 97bd79c3363555f853de5fee60bf85bdff153efd
Author: Jakub Bogusz <[email protected]>
Date: Sun Jun 9 11:22:02 2024 +0200
- updated to 6.1.0 (new soname)
lal-pulsar.spec | 32 +++++++++++++++-----------------
lalpulsar-env.patch | 8 ++++----
lalpulsar-format.patch | 18 +++++++++---------
3 files changed, 28 insertions(+), 30 deletions(-)
---
diff --git a/lal-pulsar.spec b/lal-pulsar.spec
index ad3b131..096e776 100644
--- a/lal-pulsar.spec
+++ b/lal-pulsar.spec
@@ -5,12 +5,12 @@
Summary: LAL routines for pulsar and continuous wave gravitational wave
data analysis
Summary(pl.UTF-8): Procedury LAL do analizy danych fal grawitacyjnych
pulsarów i fal ciągłych
Name: lal-pulsar
-Version: 5.2.0
+Version: 6.1.0
Release: 1
License: GPL v2+
Group: Libraries
Source0:
http://software.igwn.org/lscsoft/source/lalsuite/lalpulsar-%{version}.tar.xz
-# Source0-md5: 1a26a6d467b837b4c70f8fc5969d9c02
+# Source0-md5: bade823b2acebeef91252784ad9c7ee2
Patch0: lalpulsar-env.patch
Patch1: lalpulsar-format.patch
Patch2: lalpulsar-sse2.patch
@@ -22,10 +22,10 @@ BuildRequires: fftw3-devel >= 3
BuildRequires: fftw3-single-devel >= 3
BuildRequires: gsl-devel >= 1.13
BuildRequires: help2man >= 1.37
-BuildRequires: lal-devel >= 7.2.2
-BuildRequires: lal-frame-devel >= 2.0.0
+BuildRequires: lal-devel >= 7.5.0
+BuildRequires: lal-frame-devel >= 3.0.0
BuildRequires: lal-inference-devel >= 4.1.0
-BuildRequires: lal-simulation-devel >= 3.1.0
+BuildRequires: lal-simulation-devel >= 5.4.0
BuildRequires: libgomp-devel
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2
@@ -39,10 +39,10 @@ BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildRequires: zlib-devel
Requires: gsl >= 1.13
-Requires: lal >= 7.2.2
-Requires: lal-frame >= 2.0.0
+Requires: lal >= 7.5.0
+Requires: lal-frame >= 3.0.0
Requires: lal-inference >= 4.1.0
-Requires: lal-simulation >= 3.1.0
+Requires: lal-simulation >= 5.4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -59,10 +59,10 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki lal-pulsar
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gsl-devel >= 1.13
-Requires: lal-devel >= 7.2.2
-Requires: lal-frame-devel >= 2.0.0
+Requires: lal-devel >= 7.5.0
+Requires: lal-frame-devel >= 3.0.0
Requires: lal-inference-devel >= 4.1.0
-Requires: lal-simulation-devel >= 3.1.0
+Requires: lal-simulation-devel >= 5.4.0
%description devel
Header files for lal-pulsar library.
@@ -87,7 +87,7 @@ Summary: Octave interface for LAL Pulsar
Summary(pl.UTF-8): Interfejs Octave do biblioteki LAL Pulsar
Group: Applications/Math
Requires: %{name} = %{version}-%{release}
-Requires: octave-lal >= 7.2.2
+Requires: octave-lal >= 7.5.0
%description -n octave-lalpulsar
Octave interface for LAL Pulsar.
@@ -100,7 +100,7 @@ Summary: Python bindings for LAL Pulsar
Summary(pl.UTF-8): Wiązania Pythona do biblioteki LAL Pulsar
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
-Requires: python3-lal >= 7.2.4
+Requires: python3-lal >= 7.5.0
Requires: python3-lalframe >= 2.0.0
Requires: python3-lalinference >= 4.1.0
Requires: python3-lalsimulation >= 3.1.0
@@ -122,8 +122,6 @@ Wiązania Pythona do biblioteki LAL Pulsar.
%patch1 -p1
%patch2 -p1
-%{__sed} -i -e '1s,/usr/bin/env tclsh,/usr/bin/tclsh,'
bin/MakeData/lalpulsar_CopySFTs
-
%build
%{__libtoolize}
%{__aclocal} -I gnuscripts
@@ -157,7 +155,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS README.md
%attr(755,root,root) %{_bindir}/lalpulsar_Compute*
-%attr(755,root,root) %{_bindir}/lalpulsar_CopySFTs
+%attr(755,root,root) %{_bindir}/lalpulsar_CopyPublicSFTs
%attr(755,root,root) %{_bindir}/lalpulsar_DriveHoughMulti
%attr(755,root,root) %{_bindir}/lalpulsar_FstatMetric_v2
%attr(755,root,root) %{_bindir}/lalpulsar_HierarchSearchGCT
@@ -187,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/lalpulsar_synthesize*
%attr(755,root,root) %{_bindir}/lalpulsar_version
%attr(755,root,root) %{_libdir}/liblalpulsar.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblalpulsar.so.26
+%attr(755,root,root) %ghost %{_libdir}/liblalpulsar.so.29
%{_datadir}/lalpulsar
/etc/shrc.d/lalpulsar-user-env.csh
/etc/shrc.d/lalpulsar-user-env.fish
diff --git a/lalpulsar-env.patch b/lalpulsar-env.patch
index f04459d..8496cf9 100644
--- a/lalpulsar-env.patch
+++ b/lalpulsar-env.patch
@@ -1,7 +1,7 @@
---- lalpulsar-5.2.0/Makefile.am.orig 2022-11-03 23:47:47.060846839 +0100
-+++ lalpulsar-5.2.0/Makefile.am 2023-02-11 17:33:50.397001264 +0100
-@@ -25,11 +25,6 @@ SUBDIRS = \
- user_environment = \
+--- lalpulsar-6.1.0/Makefile.am.orig 2024-06-09 08:48:17.267707892 +0200
++++ lalpulsar-6.1.0/Makefile.am 2024-06-09 09:06:02.015272993 +0200
+@@ -26,11 +26,6 @@ user_environment = \
+ trailingcolon MANPATH; \
set $(PACKAGE)_PREFIX $(prefix); \
set $(PACKAGE)_DATADIR $(pkgdatadir); \
- prepend MANPATH $(mandir); \
diff --git a/lalpulsar-format.patch b/lalpulsar-format.patch
index aaab135..291de51 100644
--- a/lalpulsar-format.patch
+++ b/lalpulsar-format.patch
@@ -1,11 +1,11 @@
---- lalpulsar-5.2.0/lib/PSDutils.c.orig 2022-11-03 16:17:39.156369773
+0100
-+++ lalpulsar-5.2.0/lib/PSDutils.c 2023-02-11 17:30:41.491357987 +0100
-@@ -547,7 +547,7 @@ REAL8 XLALMathOpOverArray ( const REAL8*
+--- lalpulsar-6.1.0/lib/PSDutils.c.orig 2024-06-09 09:06:21.881832033
+0200
++++ lalpulsar-6.1.0/lib/PSDutils.c 2024-06-09 09:10:57.030341426 +0200
+@@ -562,7 +562,7 @@ REAL8 XLALMathOpOverArray( const REAL8 *
; /* empty statement because declaration cannot be first line in a switch
case */
- size_t * sortidx;
- if ( ( sortidx = XLALMalloc ( length * sizeof(size_t) )) == NULL ) {
-- XLALPrintError ("XLALMalloc(%ld) failed.\n", length );
-+ XLALPrintError ("XLALMalloc(%zd) failed.\n", length );
- XLAL_ERROR ( XLAL_ENOMEM);
+ size_t *sortidx;
+ if ( ( sortidx = XLALMalloc( length * sizeof( size_t ) ) ) == NULL ) {
+- XLALPrintError( "XLALMalloc(%ld) failed.\n", length );
++ XLALPrintError( "XLALMalloc(%zd) failed.\n", length );
+ XLAL_ERROR( XLAL_ENOMEM );
}
- gsl_sort_index(sortidx, data, 1, length);
+ gsl_sort_index( sortidx, data, 1, length );
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lal-pulsar.git/commitdiff/97bd79c3363555f853de5fee60bf85bdff153efd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
