Accepting request 845391 from home:badshah400:branches:science

* Replace BuildRequires: libframe-devel by framel-devel: the former is superseded by the latter.
* Specfile cleanups using spec-cleaner.

OBS-URL: https://build.opensuse.org/request/show/845391
OBS-URL: https://build.opensuse.org/package/show/science/lalapps?expand=0&rev=5
This commit is contained in:
2020-11-03 16:03:41 +00:00
committed by Git OBS Bridge
parent 9dfc92454f
commit 79f9a70fa1
2 changed files with 15 additions and 8 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Nov 2 10:49:34 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Replace BuildRequires: libframe-devel by framel-devel: the
former is superseded by the latter.
- Specfile cleanups using spec-cleaner.
-------------------------------------------------------------------
Mon Aug 31 06:10:58 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package lalapps
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define skip_python2 1
Name: lalapps
Version: 6.26.1
@@ -29,12 +30,12 @@ Patch0: lalapps-fix-uninitialised-var.patch
BuildRequires: %{python_module astropy}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module glue}
BuildRequires: %{python_module lal >= 6.21.0}
BuildRequires: %{python_module lalburst >= 1.5.4}
BuildRequires: %{python_module lalframe >= 1.5.0}
BuildRequires: %{python_module lalinference >= 1.11.0}
BuildRequires: %{python_module lalmetaio >= 1.6.0}
BuildRequires: %{python_module lalpulsar >= 1.18.0}
BuildRequires: %{python_module lal >= 6.21.0}
BuildRequires: %{python_module matplotlib}
BuildRequires: %{python_module numpy-devel}
BuildRequires: %{python_module numpy}
@@ -46,6 +47,7 @@ BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
BuildRequires: swig
BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(framel)
BuildRequires: pkgconfig(gsl)
BuildRequires: pkgconfig(lal) >= 6.21.0
BuildRequires: pkgconfig(lalburst) >= 1.5.4
@@ -55,7 +57,6 @@ BuildRequires: pkgconfig(lalinspiral) >= 1.10.0
BuildRequires: pkgconfig(lalmetaio) >= 1.6.0
BuildRequires: pkgconfig(lalpulsar) >= 1.18.0
BuildRequires: pkgconfig(lalsimulation) >= 1.10.0
BuildRequires: pkgconfig(libframe)
Requires: python3-lal >= 6.21.0
Requires: python3-lalburst >= 1.5.4
Requires: python3-lalframe >= 1.5.0
@@ -67,8 +68,7 @@ Requires: python3-lalsimulation >= 1.10.0
Requires: python3-numpy
Requires: python3-scipy
# 32-bit no longer supported upstream
ExcludeArch: %ix86
ExcludeArch: %{ix86}
%python_subpackages
%description
@@ -80,20 +80,20 @@ Algorithm Library.
%autosetup -p1
# FIX env-BASED HASHBANGS
sed -Ei "1{s|/usr/bin/env python|/usr/bin/python3|}" \
sed -Ei "1{s|/usr/bin/env python|%{_bindir}/python3|}" \
src/pulsar/HeterodyneSearch/make_frame_cache
%build
%{python_expand # Necessary to run %%configure with both py2 and py3
export PYTHON=%{_bindir}/$python
mkdir ../$python
cp -pr ./ ../$python
cp -pr ./ ../$python
pushd ../$python
# FIXME: Failures because XLAL_ERROR implictly converts to function return type
export CFLAGS+=" -Wno-enum-conversion"
%configure \
%configure --enable-swig
make %{?_smp_mflags}
%make_build
popd
}