Accepting request 945461 from science

OBS-URL: https://build.opensuse.org/request/show/945461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lalapps?expand=0&rev=5

lalapps-7.2.0.tar.xz

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

lalapps-7.4.0.tar.xz

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

lalapps-fix-uninitialised-var.patch

@@ -1,7 +1,7 @@
-Index: lalapps-7.1.0/src/string/StringSearch.c
+Index: lalapps-7.4.0/src/string/StringSearch.c
 ===================================================================
---- lalapps-7.1.0.orig/src/string/StringSearch.c
+--- lalapps-7.4.0.orig/src/string/StringSearch.c
-+++ lalapps-7.1.0/src/string/StringSearch.c
++++ lalapps-7.4.0/src/string/StringSearch.c
 @@ -201,7 +201,7 @@ int main(int argc,char *argv[])
    unsigned seg_length;
    StringTemplate strtemplate[MAXTEMPLATES];
@@ -11,10 +11,10 @@ Index: lalapps-7.1.0/src/string/StringSearch.c
    REAL8 fcutoff_fix[MAXTEMPLATES]; /* high frequency cutoffs given by the template bank file */
    SnglBurst *events=NULL;
    MetadataTable  process;
-Index: lalapps-7.1.0/src/pulsar/HoughFstat/HierarchicalSearch.c
+Index: lalapps-7.4.0/src/pulsar/HoughFstat/HierarchicalSearch.c
 ===================================================================
---- lalapps-7.1.0.orig/src/pulsar/HoughFstat/HierarchicalSearch.c
+--- lalapps-7.4.0.orig/src/pulsar/HoughFstat/HierarchicalSearch.c
-+++ lalapps-7.1.0/src/pulsar/HoughFstat/HierarchicalSearch.c
++++ lalapps-7.4.0/src/pulsar/HoughFstat/HierarchicalSearch.c
 @@ -1255,7 +1255,7 @@ void SetUpSFTs( LALStatus *status,			/**
    REAL8 timebase, tObs, deltaFsft;
    UINT4 k,numSFTby2;
@@ -33,11 +33,11 @@ Index: lalapps-7.1.0/src/pulsar/HoughFstat/HierarchicalSearch.c
    HoughStats stats; /* statistics struct */
    CHAR *fileStats = NULL;
    FILE *fpStats = NULL;
-Index: lalapps-7.1.0/src/pulsar/SFTTools/splitSFTs.c
+Index: lalapps-7.4.0/src/pulsar/SFTTools/splitSFTs.c
 ===================================================================
---- lalapps-7.1.0.orig/src/pulsar/SFTTools/splitSFTs.c
+--- lalapps-7.4.0.orig/src/pulsar/SFTTools/splitSFTs.c
-+++ lalapps-7.1.0/src/pulsar/SFTTools/splitSFTs.c
++++ lalapps-7.4.0/src/pulsar/SFTTools/splitSFTs.c
-@@ -196,7 +196,7 @@ int main( int argc, char **argv )
+@@ -204,7 +204,7 @@ int main( int argc, char **argv )
  {
    int arg;                        /* current command-line argument */
    unsigned int bin;               /* current bin */

lalapps-gcc11-array-bounds-decl.patch

@@ -1,25 +0,0 @@
-From 929605564d04da773fc4bab553360219077344b9 Mon Sep 17 00:00:00 2001
-From: John Veitch <john.veitch@ligo.org>
-Date: Wed, 12 May 2021 21:53:46 +0100
-Subject: [PATCH] Fix coh_ptf array bounds declaration
-
----
- src/ring/coh_PTF_utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ring/coh_PTF_utils.c b/src/ring/coh_PTF_utils.c
-index c8a5a96226..0df577c64c 100644
---- a/src/ring/coh_PTF_utils.c
-+++ b/src/ring/coh_PTF_utils.c
-@@ -225,7 +225,7 @@ void coh_PTF_setup_null_stream(
- /* Be aware this is separate from the null SNR! */
- int coh_PTF_get_null_stream(
-     struct coh_PTF_params *params,
--    REAL4TimeSeries **channel,
-+    REAL4TimeSeries *channel[LAL_NUM_IFO+1],
-     REAL4 *Fplus,
-     REAL4 *Fcross,
-     REAL4 *timeOffsets )
--- 
-GitLab
-

lalapps.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Jan  3 00:52:11 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 7.4.0:
+  * No release notes.
+- Drop lalapps-gcc11-array-bounds-decl.patch: upstreamed.
+
+-------------------------------------------------------------------
+Wed Sep 15 09:20:02 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Do not pass "-Wno-enum-conversion" to CFLAGS as XLALERROR
+  issues have been fixed (probably with version 7.1.0).
+
 -------------------------------------------------------------------
 Mon Sep 13 13:58:08 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
 

lalapps.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lalapps
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 # NEP 29: astropy, numpy, scipy do not have a python36 flavor package in TW
 %define skip_python36 1
 Name:           lalapps
-Version:        7.2.0
+Version:        7.4.0
 Release:        0
 Summary:        LSC Algorithm Library Applications
 License:        GPL-2.0-or-later
@@ -29,8 +29,6 @@ URL:            https://wiki.ligo.org/Computing/DASWG/LALSuite
 Source:         http://software.ligo.org/lscsoft/source/lalsuite/%{name}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM lalapps-fix-uninitialised-var.patch badshah400@gmail.com -- Fix usage of uninitialised variable
 Patch0:         lalapps-fix-uninitialised-var.patch
-# PATCH-FIX-UPSTREAM lalapps-gcc11-array-bounds-decl.patch badshah400@gmail.com -- Fix building with gcc 11 by correcting array bounds declaration; patch part of upstream merge request [https://git.ligo.org/lscsoft/lalsuite/-/merge_requests/1605]
-Patch1:         lalapps-gcc11-array-bounds-decl.patch
 # PATCH-FIX-UPSTREAM lalapps-disable-testWeave-for-non-x86_64.patch badshah400@gmail.com -- Disable Weave related tests on all but x86_64 where tolerance errors show up, see https://git.ligo.org/lscsoft/lalsuite/-/issues/105
 Patch2:         lalapps-disable-testWeave-for-non-x86_64.patch
 BuildRequires:  %{python_module astropy}
@@ -110,10 +108,6 @@ This package contains the python files
 %prep
 %autosetup -p1
 
-# FIX env-BASED HASHBANGS
-sed -Ei "1{s|/usr/bin/env python|%{_bindir}/python3|}" \
-  src/pulsar/HeterodyneSearch/make_frame_cache
-
 %build
 # Patch2 touches autotool files
 autoreconf -fvi
@@ -122,8 +116,6 @@ export PYTHON=%{_bindir}/$python
 mkdir ../$python
 cp -pr ./ ../$python
 pushd ../$python
-# FIXME: Failures because XLAL_ERROR implictly converts to function return type
-export CFLAGS+=" -Wno-enum-conversion"
 %configure --enable-swig
 %make_build
 popd