Accepting request 819093 from home:badshah400:branches:science
- Update to version 6.26.0. - Minor refresh of lalapps-fix-uninitialised-var.patch with upstream file naming and other changes. - Disable 32-bit builds: no longer supported upstream. - Fix an env based hashbang. OBS-URL: https://build.opensuse.org/request/show/819093 OBS-URL: https://build.opensuse.org/package/show/science/lalapps?expand=0&rev=3
This commit is contained in:
Git OBS Bridge
parent
d93d82d2a9
commit
237e304e27
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ef91dbe0c8926bd279b04ace327a61d5d88e14887b11664419edefa63e337224
|
||||
size 5002476
|
||||
3
lalapps-6.26.0.tar.xz
Normal file
3
lalapps-6.26.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:656e9f6386ecfa639fcba81f937c756838a95f3a33439445a61262084a7ab27b
|
||||
size 11077712
|
||||
@ -1,8 +1,8 @@
|
||||
Index: lalapps-6.24.0/src/string/StringSearch.c
|
||||
Index: lalapps-6.26.0/src/string/StringSearch.c
|
||||
===================================================================
|
||||
--- lalapps-6.24.0.orig/src/string/StringSearch.c
|
||||
+++ lalapps-6.24.0/src/string/StringSearch.c
|
||||
@@ -203,7 +203,7 @@ int main(int argc,char *argv[])
|
||||
--- lalapps-6.26.0.orig/src/string/StringSearch.c
|
||||
+++ lalapps-6.26.0/src/string/StringSearch.c
|
||||
@@ -202,7 +202,7 @@ int main(int argc,char *argv[])
|
||||
unsigned seg_length;
|
||||
StringTemplate strtemplate[MAXTEMPLATES];
|
||||
int NTemplates;
|
||||
@ -11,10 +11,10 @@ Index: lalapps-6.24.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-6.24.0/src/pulsar/SFTTools/SFTvalidate.c
|
||||
Index: lalapps-6.26.0/src/pulsar/SFTTools/SFTvalidate.c
|
||||
===================================================================
|
||||
--- lalapps-6.24.0.orig/src/pulsar/SFTTools/SFTvalidate.c
|
||||
+++ lalapps-6.24.0/src/pulsar/SFTTools/SFTvalidate.c
|
||||
--- lalapps-6.26.0.orig/src/pulsar/SFTTools/SFTvalidate.c
|
||||
+++ lalapps-6.26.0/src/pulsar/SFTTools/SFTvalidate.c
|
||||
@@ -59,7 +59,7 @@ int main(int argc, char** argv) {
|
||||
/* and read successive SFTs blocks from the file and validate CRC
|
||||
checksums */
|
||||
@ -24,37 +24,11 @@ Index: lalapps-6.24.0/src/pulsar/SFTTools/SFTvalidate.c
|
||||
int err=0, swapendian, move, j;
|
||||
|
||||
err=ReadSFTHeader(fp, &info, NULL, &swapendian, 1);
|
||||
Index: lalapps-6.24.0/src/pulsar/SFTTools/SFTdumpheader.c
|
||||
Index: lalapps-6.26.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
===================================================================
|
||||
--- lalapps-6.24.0.orig/src/pulsar/SFTTools/SFTdumpheader.c
|
||||
+++ lalapps-6.24.0/src/pulsar/SFTTools/SFTdumpheader.c
|
||||
@@ -54,7 +54,7 @@ int main(int argc, char **argv) {
|
||||
/* and read successive SFTs blocks from the file and print headers */
|
||||
for (count=0; 1; count++) {
|
||||
|
||||
- struct headertag2 info,lastinfo;
|
||||
+ struct headertag2 info,lastinfo={};
|
||||
int err=0, swapendian, move;
|
||||
char *mycomment;
|
||||
|
||||
Index: lalapps-6.24.0/src/pulsar/SFTTools/SFTdumpall.c
|
||||
===================================================================
|
||||
--- lalapps-6.24.0.orig/src/pulsar/SFTTools/SFTdumpall.c
|
||||
+++ lalapps-6.24.0/src/pulsar/SFTTools/SFTdumpall.c
|
||||
@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
|
||||
/* and read successive SFTs blocks from the file and print headers */
|
||||
for (count=0; 1; count++) {
|
||||
|
||||
- struct headertag2 info, lastinfo;
|
||||
+ struct headertag2 info, lastinfo={};
|
||||
int err=0, swapendian, move;
|
||||
char *mycomment;
|
||||
int whence = (int)ftell(fp);
|
||||
Index: lalapps-6.24.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
===================================================================
|
||||
--- lalapps-6.24.0.orig/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
+++ lalapps-6.24.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
@@ -1270,7 +1270,7 @@ void SetUpSFTs( LALStatus *status, /**
|
||||
--- lalapps-6.26.0.orig/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
+++ lalapps-6.26.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
@@ -1255,7 +1255,7 @@ void SetUpSFTs( LALStatus *status, /**
|
||||
REAL8 timebase, tObs, deltaFsft;
|
||||
UINT4 k,numSFTby2;
|
||||
LIGOTimeGPS tStartGPS, tEndGPS, refTimeGPS, tMidGPS;
|
||||
@ -63,7 +37,7 @@ Index: lalapps-6.24.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
|
||||
REAL8 doppWings, fMin, fMax;
|
||||
REAL8 startTime_freqLo, startTime_freqHi;
|
||||
@@ -1531,7 +1531,7 @@ void ComputeFstatHoughMap(LALStatus *sta
|
||||
@@ -1516,7 +1516,7 @@ void ComputeFstatHoughMap(LALStatus *sta
|
||||
LIGOTimeGPSVector *tsMid;
|
||||
REAL8Vector *timeDiffV=NULL;
|
||||
UINT8Vector hist; /* histogram vector */
|
||||
@ -72,3 +46,16 @@ Index: lalapps-6.24.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
HoughStats stats; /* statistics struct */
|
||||
CHAR *fileStats = NULL;
|
||||
FILE *fpStats = NULL;
|
||||
Index: lalapps-6.26.0/src/pulsar/SFTTools/splitSFTs.c
|
||||
===================================================================
|
||||
--- lalapps-6.26.0.orig/src/pulsar/SFTTools/splitSFTs.c
|
||||
+++ lalapps-6.26.0/src/pulsar/SFTTools/splitSFTs.c
|
||||
@@ -199,7 +199,7 @@ int main( int argc, char **argv )
|
||||
{
|
||||
int arg; /* current command-line argument */
|
||||
unsigned int bin; /* current bin */
|
||||
- struct headertag2 hd, lasthd; /* header of input SFT */
|
||||
+ struct headertag2 hd, lasthd = {}; /* header of input SFT */
|
||||
FILE *fpin; /* currently open input filepointer */
|
||||
FILE *fpout; /* currently open output filepointer */
|
||||
char *oldcomment; /* comment of input SFT */
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 7 02:34:22 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 6.26.0:
|
||||
* No release notes.
|
||||
- Minor refresh of lalapps-fix-uninitialised-var.patch with
|
||||
upstream file naming and other changes.
|
||||
- Disable 32-bit builds: no longer supported upstream.
|
||||
- Fix an env based hashbang.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 1 01:21:52 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
@ -16,9 +16,8 @@
|
||||
#
|
||||
|
||||
%define skip_python2 1
|
||||
|
||||
Name: lalapps
|
||||
Version: 6.25.1
|
||||
Version: 6.26.0
|
||||
Release: 0
|
||||
Summary: LSC Algorithm Library Applications
|
||||
License: GPL-2.0-or-later
|
||||
@ -67,6 +66,8 @@ Requires: python3-lalpulsar >= 1.18.0
|
||||
Requires: python3-lalsimulation >= 1.10.0
|
||||
Requires: python3-numpy
|
||||
Requires: python3-scipy
|
||||
# 32-bit no longer supported upstream
|
||||
ExcludeArch: %ix86
|
||||
|
||||
%python_subpackages
|
||||
|
||||
@ -80,7 +81,6 @@ Algorithm Library.
|
||||
|
||||
# FIX env-BASED HASHBANGS
|
||||
sed -Ei "1{s|/usr/bin/env python|/usr/bin/python3|}" \
|
||||
src/pulsar/CrossCorr/*.py \
|
||||
src/pulsar/HeterodyneSearch/make_frame_cache
|
||||
|
||||
%build
|
||||
@ -105,6 +105,9 @@ pushd ../$python
|
||||
popd
|
||||
}
|
||||
|
||||
# env-based hashbang /usr/bin/env tclsh => /usr/bin/tclsh
|
||||
sed -Ei "1{s/env //}" %{buildroot}%{_bindir}/lalapps_CopySFTs
|
||||
|
||||
# SECTION EXPORT LAL SPECIFIC ENV VARIABLES
|
||||
# We do not use upstream's env files because they also set more generic
|
||||
# variables (e.g. PATH) which may ruin setups
|
||||
|
||||
Loading…
Reference in New Issue
Block a user