Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lalpulsar for openSUSE:Factory checked in at 2022-08-24 15:11:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lalpulsar (Old) and /work/SRC/openSUSE:Factory/.lalpulsar.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lalpulsar" Wed Aug 24 15:11:10 2022 rev:6 rq:998930 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lalpulsar/lalpulsar.changes 2022-01-17 22:34:05.358245455 +0100 +++ /work/SRC/openSUSE:Factory/.lalpulsar.new.2083/lalpulsar.changes 2022-08-24 15:11:30.536524541 +0200 @@ -1,0 +2,28 @@ +Tue Aug 23 23:50:58 UTC 2022 - Atri Bhattacharya <[email protected]> + +- Fix multibuild package names. + +------------------------------------------------------------------- +Sat Aug 20 11:26:04 UTC 2022 - Atri Bhattacharya <[email protected]> + +- Update to version 5.0.0: + * No release notes. +- New BuildRequires: pkgconfig(lalsimulation), + pkgconfig(lalinference). +- Update source URL. +- Pass "-Wno-error=address" to CFLAGS to disable errors on minor + warnings. +- Testing takes rather long; split out tests as part of %check + into a separate _multibuild flavour so that it does not hold + up builds of dependent packages. +- Add lalpulsar-disable-test_ssbtodetector.patch to disable a test + that we cannot run on openSUSE yet due to missing pkgs. +- Add lalpulsar-fix-uninitialized-var.patch: Fix an uninitialised + variable. +- Change build dir naming used to build the different python + flavours so that the env var PYTHON, which is also used to set + up script hashbangs, can be set to the full python executable. +- Update so version to match upstream. +- Fix an env-based hashbang in a script. + +------------------------------------------------------------------- Old: ---- lalpulsar-3.1.1.tar.xz New: ---- _multibuild lalpulsar-5.0.0.tar.xz lalpulsar-disable-test_ssbtodetector.patch lalpulsar-fix-uninitialized-var.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lalpulsar.spec ++++++ --- /var/tmp/diff_new_pack.NDDiH8/_old 2022-08-24 15:11:32.356526297 +0200 +++ /var/tmp/diff_new_pack.NDDiH8/_new 2022-08-24 15:11:32.360526301 +0200 @@ -16,7 +16,18 @@ # -%define shlib lib%{name}23 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%bcond_without test +%define psuffix -test +%else +%bcond_with test +%define psuffix %{nil} +%endif + +%define pname lalpulsar + +%define shlib lib%{name}26 # octave >= 6 is not supported %bcond_with octave @@ -25,30 +36,40 @@ # Py2 support drop by upstream %define skip_python2 1 -Name: lalpulsar -Version: 3.1.1 +Name: %{pname}%{?psuffix} +Version: 5.0.0 Release: 0 Summary: LSC Algorithm Pulsar Library License: GPL-2.0-or-later Group: Productivity/Scientific/Physics URL: https://wiki.ligo.org/Computing/LALSuite -Source: http://software.ligo.org/lscsoft/source/lalsuite/%{name}-%{version}.tar.xz +Source: https://software.igwn.org/sources/source/lalsuite/%{pname}-%{version}.tar.xz # PATCH-FIX-UPSTREAM lalpulsar-printf-type-mismatch.patch [email protected] -- Fix type mismatch when passing variables to printf Patch0: lalpulsar-printf-type-mismatch.patch +# PATCH-FIX-OPENSUSE lalpulsar-disable-test_ssbtodetector.patch [email protected] -- Disable a test that requires packages not yet availabe on openSUSE +Patch1: lalpulsar-disable-test_ssbtodetector.patch +# PATCH-FIX-UPSTREAM lalpulsar-fix-uninitialized-var.patch [email protected] -- Fix an uninitialised variable +Patch2: lalpulsar-fix-uninitialized-var.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module lal >= 7.1.0} BuildRequires: %{python_module numpy-devel >= 1.7} BuildRequires: %{python_module numpy} BuildRequires: fdupes +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: swig BuildRequires: pkgconfig(cfitsio) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(gsl) -BuildRequires: pkgconfig(lal) -BuildRequires: pkgconfig(lalframe) -Requires: python-lal +BuildRequires: pkgconfig(lal) >= 7.2.0 +BuildRequires: pkgconfig(lalframe) >= 2.0.0 +BuildRequires: pkgconfig(lalinference) >= 4.0.0 +BuildRequires: pkgconfig(lalsimulation) >= 4.0.0 +Requires: python-lal >= 7.2.0 +Requires: python-lalframe >= 2.0.0 +Requires: python-lalinference >= 4.0.0 +Requires: python-lalsimulation >= 4.0.0 Requires: python-numpy Recommends: %{name}-data = %{version} ExcludeArch: %{ix86} @@ -60,9 +81,16 @@ BuildRequires: pkgconfig(octave) %endif # SECTION For tests +%if %{with test} BuildRequires: %{python_module astropy} +BuildRequires: %{python_module h5py} +BuildRequires: %{python_module lal >= 7.2.0} BuildRequires: %{python_module lalframe} +BuildRequires: %{python_module lalinference >= 4.0.0} +BuildRequires: %{python_module lalsimulation >= 4.0.0} BuildRequires: %{python_module pytest} +BuildRequires: bc +%endif # /SECTION %python_subpackages @@ -84,7 +112,10 @@ Requires: pkgconfig(cfitsio) Requires: pkgconfig(fftw3) Requires: pkgconfig(gsl) -Requires: pkgconfig(lal) +Requires: pkgconfig(lal) >= 7.2.0 +Requires: pkgconfig(lalframe) >= 2.0.0 +Requires: pkgconfig(lalinference) >= 4.0.0 +Requires: pkgconfig(lalsimulation) >= 4.0.0 %description -n %{name}-devel This package contains sources and header files needed to build applications @@ -93,6 +124,7 @@ %package -n %{name}-data Summary: Data files for use with LAL Pulsar Group: Productivity/Scientific/Physics +BuildArch: noarch %description -n %{name}-data This package provides auxiliary data useful for analyses with LAL Pulsar. @@ -107,25 +139,30 @@ This package provides the necessary files for using LAL Pulsar with octave. %prep -%autosetup -p1 +%autosetup -p1 -n %{pname}-%{version} %build +# Patch1 needs autoreconf +autoreconf -fvi %{python_expand # Necessary to run configure with multiple py3 flavors -export PYTHON=$python -mkdir ../${PYTHON}_build -cp -pr ./ ../${PYTHON}_build -pushd ../${PYTHON}_build +export PYTHON=%{_bindir}/$python +mkdir ../$python +cp -pr ./ ../$python +pushd ../$python +export CFLAGS="%{optflags} -Wno-error=address" +export CXXFLAGS=${CFLAGS} %configure \ %{?with_octave:--enable-swig-octave} \ %{!?with_octave:--disable-swig-octave} -%make_build +%make_build %{?with_test:test} popd } %install +%if %{without test} %{python_expand # Multiple py3 flavors make_install -export PYTHON=$python -pushd ../${PYTHON}_build +export PYTHON=%{_bindir}/$python +pushd ../$python %make_install popd } @@ -163,14 +200,9 @@ find %{buildroot} -type f -name "*.la" -delete -print # /SECTION -%python_expand %fdupes %{buildroot}%{$python_sitearch}/%{name}/ +sed -i "1s|/usr/bin/env tclsh|/usr/bin/tclsh|" %{buildroot}%{_bindir}/lalpulsar_CopySFTs -%check -%{python_expand export PYTHON=$python -pushd ../${PYTHON}_build -%make_build check -popd -} +%python_expand %fdupes %{buildroot}%{$python_sitearch}/%{name}/ %post -n %{shlib} -p /sbin/ldconfig %postun -n %{shlib} -p /sbin/ldconfig @@ -201,4 +233,15 @@ %files %{python_files} %{python_sitearch}/* +%else + +%check +%{python_expand export PYTHON=%{_bindir}/$python +pushd ../$python +%make_build check +popd +} + +%endif + %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild> ++++++ lalpulsar-3.1.1.tar.xz -> lalpulsar-5.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/lalpulsar/lalpulsar-3.1.1.tar.xz /work/SRC/openSUSE:Factory/.lalpulsar.new.2083/lalpulsar-5.0.0.tar.xz differ: char 26, line 1 ++++++ lalpulsar-disable-test_ssbtodetector.patch ++++++ Index: lalpulsar-5.0.0/bin/HeterodyneSearch/Makefile.am =================================================================== --- lalpulsar-5.0.0.orig/bin/HeterodyneSearch/Makefile.am +++ lalpulsar-5.0.0/bin/HeterodyneSearch/Makefile.am @@ -98,7 +98,7 @@ endif test_scripts += test_frequency_evolution.sh if HAVE_PYTHON test_scripts += test_heterodyne.sh -test_scripts += test_ssbtodetector.py +#test_scripts += test_ssbtodetector.py test_scripts += test_flat_prior.py endif Index: lalpulsar-5.0.0/bin/check_execs_are_tested =================================================================== --- lalpulsar-5.0.0.orig/bin/check_execs_are_tested +++ lalpulsar-5.0.0/bin/check_execs_are_tested @@ -41,7 +41,7 @@ not_tested=`awk ' print "NONE" } } -' ${tested_logfiles} /dev/null | sort` +' ${tested_logfiles} /dev/null | sed "s|bin/HeterodyneSearch/lalpulsar_ssbtodetector||" | sort` if test "X${not_tested}" = XNONE; then ++++++ lalpulsar-fix-uninitialized-var.patch ++++++ Index: lalpulsar-5.0.0/bin/HoughFstat/HierarchicalSearch.c =================================================================== --- lalpulsar-5.0.0.orig/bin/HoughFstat/HierarchicalSearch.c +++ lalpulsar-5.0.0/bin/HoughFstat/HierarchicalSearch.c @@ -1255,7 +1255,7 @@ void SetUpSFTs( LALStatus *status, /** REAL8 timebase, tObs, deltaFsft; UINT4 k,numSFTby2; LIGOTimeGPS tStartGPS, tEndGPS, refTimeGPS, tMidGPS; - SFTCatalogSequence catalogSeq; + SFTCatalogSequence catalogSeq = {}; REAL8 doppWings, fMin, fMax; REAL8 startTime_freqLo, startTime_freqHi; Index: lalpulsar-5.0.0/bin/GCT/HierarchSearchGCT.c =================================================================== --- lalpulsar-5.0.0.orig/bin/GCT/HierarchSearchGCT.c +++ lalpulsar-5.0.0/bin/GCT/HierarchSearchGCT.c @@ -2048,7 +2048,7 @@ void SetUpSFTs( LALStatus *status, /** REAL8 timebase, tObs, deltaFsft; UINT4 k,numSFT; LIGOTimeGPS tStartGPS, tEndGPS, refTimeGPS, tMidGPS, midTstackGPS, startTstackGPS, endTstackGPS; - SFTCatalogSequence catalogSeq; + SFTCatalogSequence catalogSeq = {}; REAL8 midTseg,startTseg,endTseg; BOOLEAN crc_check; ++++++ lalpulsar-printf-type-mismatch.patch ++++++ --- /var/tmp/diff_new_pack.NDDiH8/_old 2022-08-24 15:11:32.432526370 +0200 +++ /var/tmp/diff_new_pack.NDDiH8/_new 2022-08-24 15:11:32.436526374 +0200 @@ -1,8 +1,8 @@ -Index: lalpulsar-3.1.1/lib/SFTutils.c +Index: lalpulsar-5.0.0/lib/SFTutils.c =================================================================== ---- lalpulsar-3.1.1.orig/lib/SFTutils.c -+++ lalpulsar-3.1.1/lib/SFTutils.c -@@ -2921,7 +2921,7 @@ REAL8 XLALMathOpOverArray ( const REAL8* +--- lalpulsar-5.0.0.orig/lib/SFTutils.c ++++ lalpulsar-5.0.0/lib/SFTutils.c +@@ -3060,7 +3060,7 @@ REAL8 XLALMathOpOverArray ( const REAL8* ; /* empty statement because declaration cannot be first line in a switch case */ size_t * sortidx; if ( ( sortidx = XLALMalloc ( length * sizeof(size_t) )) == NULL ) {
