pool/lalframe
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 819094 from home:badshah400:branches:science

Browse Source 
- Update to version 1.5.1
  * No release notes.
- New BuildRequires: pkgconfig(framel), pkgconfig(framecppc).
- Drop lalframe-build-octave44-with-swig3.patch: Incorporated
  upstream (also drop BuildRequires: libtool and the command
  autoreconf before configure).
- Re-enable octave bindings, fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/819094
OBS-URL: https://build.opensuse.org/package/show/science/lalframe?expand=0&rev=3
This commit is contained in:
Atri Bhattacharya 2020-07-10 17:37:57 +00:00 committed by Git OBS Bridge
parent f4e0f9c75b
commit 320cb1cb49
5 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lalframe-1.5.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a2c81201c36e64fe9467ac139374fe8fa793c56e48611e90fe6beca3a24f85dc
size 7319768

3
lalframe-1.5.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39604c2e012babf0a67322e71b91119206c41dd35eff8aaa0644aac932abe73d
size 7341480

23
lalframe-build-octave44-with-swig3.patch
View File

@ -1,23 +0,0 @@
Index: lal-6.21.0/gnuscripts/lalsuite_swig.m4
===================================================================
--- lal-6.21.0.orig/gnuscripts/lalsuite_swig.m4
+++ lal-6.21.0/gnuscripts/lalsuite_swig.m4
@@ -318,18 +318,6 @@ AC_DEFUN([LALSUITE_USE_SWIG_OCTAVE],[
])
])
- # debian buster has patched swig-3.0.12-2 to support octave 4.4,
- # so we ignore this requirement on that platform
- cat /etc/issue | grep -Eiq "debian .*(10|buster)"
- AS_IF([test $? -ne 0],[
- LALSUITE_VERSION_COMPARE([${octave_version}],[>=],[4.4.0],[
- LALSUITE_VERSION_COMPARE([${swig_min_version}],[<],[4.0.0],[
- swig_min_version=4.0.0
- swig_min_version_info="for Octave version ${octave_version}"
- ])
- ])
- ])
-
# determine where to install Octave bindings: take versioned site .oct file
# directory given by octave-config, and strip off prefix; thus, if LALSuite
# is installed in the same directory as Octave, .oct files will be found by

11
lalframe.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Jul 6 23:23:25 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 1.5.1
* No release notes.
- New BuildRequires: pkgconfig(framel), pkgconfig(framecppc).
- Drop lalframe-build-octave44-with-swig3.patch: Incorporated
upstream (also drop BuildRequires: libtool and the command
autoreconf before configure).
- Re-enable octave bindings, fixed upstream.
-------------------------------------------------------------------
Wed Jul 1 23:25:51 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>

12
lalframe.spec
View File

@ -17,18 +17,15 @@
%define shlib lib%{name}11
# FIXME: Disable octave support as compilation error with current swig
%bcond_with octave
%bcond_without octave
Name: lalframe
Version: 1.5.0
Version: 1.5.1
Release: 0
Summary: LSC Algorithm Frame Library for gravitational wave data analysis
License: GPL-2.0-or-later
Group: Productivity/Scientific/Physics
URL: https://wiki.ligo.org/Computing/DASWG/LALSuite
Source: http://software.ligo.org/lscsoft/source/lalsuite/lalframe-%{version}.tar.xz
# PATCH-FIX-UPSTREAM lalframe-build-octave44-with-swig3.patch badshah400@gmail.com -- Allow building octave bindings with swig 3.0.x rather than requiring swig 4.x
Patch0: lalframe-build-octave44-with-swig3.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module lal >= 6.21.0}
BuildRequires: %{python_module numpy-devel}
@ -39,10 +36,11 @@ BuildRequires: python-xml
BuildRequires: fdupes
BuildRequires: ldas-tools-framecpp-devel
BuildRequires: libframe-devel
BuildRequires: libtool
BuildRequires: python-rpm-macros
BuildRequires: swig
BuildRequires: pkgconfig
BuildRequires: pkgconfig(framecppc)
BuildRequires: pkgconfig(framel)
BuildRequires: pkgconfig(lal) >= 6.21.0
%if %{with octave}
BuildRequires: octave-lal >= 6.21.0
@ -88,8 +86,6 @@ This package provides the necessary files for using LAL Frame with octave.
%autosetup -p1
%build
autoreconf -fvi
%{python_expand # Necessary to run %%configure with both py2 and py3
export PYTHON=$python
mkdir ../${PYTHON}_build