commit 3c8a2438bc7ca4627fa4974b6c511454fa9082ea
Author: Jakub Bogusz <[email protected]>
Date: Sat Jun 8 21:08:05 2024 +0200
- updated to 3.0.4 (new soname)
lal-frame-env.patch | 8 ++++----
lal-frame.spec | 25 ++++++++++++++++---------
2 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/lal-frame.spec b/lal-frame.spec
index b304065..f42ac72 100644
--- a/lal-frame.spec
+++ b/lal-frame.spec
@@ -1,18 +1,25 @@
# TODO: framec support (BR: pkgconfig(framecppc) >= 2.5.5)
+#
+# Conditional build:
+%bcond_with framec # FrameC library support (not ready for 3.x due to some
removed functions)
+
Summary: LAL wrapping of the LILO/Virgo Frame library
Summary(pl.UTF-8): Obudowanie LAL do biblioteki LILO/Virgo Frame
Name: lal-frame
-Version: 2.0.3
+Version: 3.0.4
Release: 1
License: GPL v2+
Group: Libraries
Source0:
http://software.igwn.org/lscsoft/source/lalsuite/lalframe-%{version}.tar.xz
-# Source0-md5: e25492953f9f8c065b0e528d4658f951
+# Source0-md5: 2913cd6c52ff6cab4b91237c41b3ff1d
Patch0: %{name}-env.patch
URL: https://wiki.ligo.org/Computing/LALSuite
BuildRequires: autoconf >= 2.63
BuildRequires: automake >= 1:1.11
-BuildRequires: lal-devel >= 7.2.2
+BuildRequires: help2man >= 1.37
+BuildRequires: lal-devel >= 7.5.0
+%{?with_framec:BuildRequires: ldas-tools-framecpp-devel >= 2.5.5}
+%{?with_framec:BuildRequires: ldas-tools-framecpp-devel < 3}
BuildRequires: libframe-devel >= 8.39.2
BuildRequires: libstdc++-devel
BuildRequires: libtool >= 2:2
@@ -25,7 +32,7 @@ BuildRequires: swig-python >= 3.0.11
BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildRequires: zlib-devel
-Requires: lal >= 7.2.2
+Requires: lal >= 7.5.0
Requires: libframe >= 8.39.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,7 +47,7 @@ Summary: Header files for lal-frame library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki lal-frame
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: lal-devel >= 7.2.2
+Requires: lal-devel >= 7.5.0
Requires: libframe-devel >= 8.39.2
%description devel
@@ -66,7 +73,7 @@ Summary: Octave interface for LAL Frame
Summary(pl.UTF-8): Interfejs Octave do biblioteki LAL Frame
Group: Applications/Math
Requires: %{name} = %{version}-%{release}
-Requires: octave-lal >= 7.2.2
+Requires: octave-lal >= 7.5.0
%description -n octave-lalframe
Octave interface for LAL Frame.
@@ -79,7 +86,7 @@ Summary: Python bindings for LAL Frame
Summary(pl.UTF-8): Wiązania Pythona do biblioteki LAL Frame
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
-Requires: python3-lal >= 7.2.2
+Requires: python3-lal >= 7.5.0
Requires: python3-modules >= 1:3.5
Obsoletes: python-lalframe < 1.5
@@ -100,6 +107,7 @@ Wiązania Pythona do biblioteki LAL Frame.
%{__autoheader}
%{__automake}
%configure \
+ %{!?with_framec:--disable-framec} \
--disable-silent-rules \
--enable-swig
%{__make}
@@ -128,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/lalfr-*
%attr(755,root,root) %{_bindir}/lalframe_version
%attr(755,root,root) %{_libdir}/liblalframe.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblalframe.so.13
+%attr(755,root,root) %ghost %{_libdir}/liblalframe.so.14
/etc/shrc.d/lalframe-user-env.csh
/etc/shrc.d/lalframe-user-env.fish
/etc/shrc.d/lalframe-user-env.sh
@@ -138,7 +146,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liblalframe.so
-%{_includedir}/lal/FrameCalibration.h
%{_includedir}/lal/LALFrStream.h
%{_includedir}/lal/LALFrame*.h
%{_includedir}/lal/SWIGLALFrame*.h
diff --git a/lal-frame-env.patch b/lal-frame-env.patch
index 2d71206..3878a02 100644
--- a/lal-frame-env.patch
+++ b/lal-frame-env.patch
@@ -1,7 +1,7 @@
---- lalframe-1.4.3/Makefile.am.orig 2015-03-27 05:14:39.000000000 +0100
-+++ lalframe-1.4.3/Makefile.am 2017-07-02 18:07:40.824614178 +0200
-@@ -23,11 +23,6 @@
- user_environment = \
+--- lalframe-3.0.4/Makefile.am.orig 2024-06-05 06:26:20.852865689 +0200
++++ lalframe-3.0.4/Makefile.am 2024-06-05 06:27:27.615845336 +0200
+@@ -26,11 +26,6 @@ user_environment = \
+ trailingcolon MANPATH; \
set $(PACKAGE)_PREFIX $(prefix); \
set $(PACKAGE)_DATADIR $(pkgdatadir); \
- prepend MANPATH $(mandir); \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lal-frame.git/commitdiff/3c8a2438bc7ca4627fa4974b6c511454fa9082ea
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
