Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package lalburst for openSUSE:Factory
checked in at 2021-04-21 20:59:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lalburst (Old)
and /work/SRC/openSUSE:Factory/.lalburst.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lalburst"
Wed Apr 21 20:59:09 2021 rev:3 rq:877253 version:1.5.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/lalburst/lalburst.changes 2021-02-16
09:19:21.819198060 +0100
+++ /work/SRC/openSUSE:Factory/.lalburst.new.12324/lalburst.changes
2021-04-21 20:59:23.518200639 +0200
@@ -1,0 +2,7 @@
+Mon Mar 1 23:50:43 UTC 2021 - Atri Bhattacharya <badshah...@gmail.com>
+
+- Update to version 1.5.8 (no release notes).
+- Disable python2 build: no longer supported by upstream and
+ python-ligo-* dependencies unavailable.
+
+-------------------------------------------------------------------
Old:
----
lalburst-1.5.7.tar.xz
New:
----
lalburst-1.5.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lalburst.spec ++++++
--- /var/tmp/diff_new_pack.U5u3gH/_old 2021-04-21 20:59:23.966201345 +0200
+++ /var/tmp/diff_new_pack.U5u3gH/_new 2021-04-21 20:59:23.970201351 +0200
@@ -18,11 +18,14 @@
# NEP 29: python36-numpy and co. in TW are no more
%define skip_python36 1
+# python2 not supported by upstream
+%define skip_python2 1
+
%define shlib lib%{name}6
# octave >= 6 not supported
%bcond_with octave
Name: lalburst
-Version: 1.5.7
+Version: 1.5.8
Release: 0
Summary: LSC Algorithm Burst Library
License: GPL-2.0-or-later
++++++ lalburst-1.5.7.tar.xz -> lalburst-1.5.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/bin/version.c
new/lalburst-1.5.8/bin/version.c
--- old/lalburst-1.5.7/bin/version.c 2021-01-27 17:14:46.119828203 +0100
+++ new/lalburst-1.5.8/bin/version.c 2021-02-18 18:14:35.629727780 +0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#include <stdio.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/bin/version.c.in
new/lalburst-1.5.8/bin/version.c.in
--- old/lalburst-1.5.7/bin/version.c.in 2021-01-27 03:45:33.568679568 +0100
+++ new/lalburst-1.5.8/bin/version.c.in 2021-02-11 02:06:07.459963059 +0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#include <stdio.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/conda/build.sh
new/lalburst-1.5.8/conda/build.sh
--- old/lalburst-1.5.7/conda/build.sh 2021-01-27 02:36:30.524519687 +0100
+++ new/lalburst-1.5.8/conda/build.sh 2021-02-16 00:25:21.749373442 +0100
@@ -24,6 +24,7 @@
--disable-python \
--disable-swig-octave \
--disable-swig-python \
+ --enable-help2man \
--enable-swig-iface \
--prefix="${PREFIX}" \
${EXTRA_CONFIG_FLAGS} \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/conda/install-bin.sh
new/lalburst-1.5.8/conda/install-bin.sh
--- old/lalburst-1.5.7/conda/install-bin.sh 2021-01-27 02:36:30.435517706
+0100
+++ new/lalburst-1.5.8/conda/install-bin.sh 2021-02-16 00:25:21.740373229
+0100
@@ -11,27 +11,3 @@
# install system configuration files
make -j ${CPU_COUNT} V=1 VERBOSE=1 install-sysconfDATA
-
-# -- create activate/deactivate scripts
-PKG_NAME_UPPER=$(echo ${PKG_NAME} | awk '{ print toupper($0) }')
-
-# activate.sh
-ACTIVATE_SH="${PREFIX}/etc/conda/activate.d/activate_${PKG_NAME}.sh"
-mkdir -p $(dirname ${ACTIVATE_SH})
-cat > ${ACTIVATE_SH} << EOF
-#!/bin/bash
-export
CONDA_BACKUP_${PKG_NAME_UPPER}_DATADIR="\${${PKG_NAME_UPPER}_DATADIR:-empty}"
-export
${PKG_NAME_UPPER}_DATADIR="/opt/anaconda1anaconda2anaconda3/share/${PKG_NAME}"
-EOF
-# deactivate.sh
-DEACTIVATE_SH="${PREFIX}/etc/conda/deactivate.d/deactivate_${PKG_NAME}.sh"
-mkdir -p $(dirname ${DEACTIVATE_SH})
-cat > ${DEACTIVATE_SH} << EOF
-#!/bin/bash
-if [ "\${CONDA_BACKUP_${PKG_NAME_UPPER}_DATADIR}" == "empty" ]; then
- unset ${PKG_NAME_UPPER}_DATADIR
-else
- export
${PKG_NAME_UPPER}_DATADIR="\${CONDA_BACKUP_${PKG_NAME_UPPER}_DATADIR}"
-fi
-unset CONDA_BACKUP_${PKG_NAME_UPPER}_DATADIR
-EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/conda/install-lib.sh
new/lalburst-1.5.8/conda/install-lib.sh
--- old/lalburst-1.5.7/conda/install-lib.sh 2021-01-27 02:36:30.435517706
+0100
+++ new/lalburst-1.5.8/conda/install-lib.sh 2021-02-16 00:25:21.740373229
+0100
@@ -12,3 +12,30 @@
# install pkg-config
make -j ${CPU_COUNT} V=1 VERBOSE=1 install-pkgconfigDATA
+
+# -- create activate/deactivate scripts
+
+# strip out the 'lib' package name prefix
+LALSUITE_NAME=${PKG_NAME#"lib"}
+LALSUITE_NAME_UPPER=$(echo ${LALSUITE_NAME} | awk '{ print toupper($0) }')
+
+# activate.sh
+ACTIVATE_SH="${PREFIX}/etc/conda/activate.d/activate_${PKG_NAME}.sh"
+mkdir -p $(dirname ${ACTIVATE_SH})
+cat > ${ACTIVATE_SH} << EOF
+#!/bin/bash
+export
CONDA_BACKUP_${LALSUITE_NAME_UPPER}_DATADIR="\${${LALSUITE_NAME_UPPER}_DATADIR:-empty}"
+export
${LALSUITE_NAME_UPPER}_DATADIR="/opt/anaconda1anaconda2anaconda3/share/${LALSUITE_NAME}"
+EOF
+# deactivate.sh
+DEACTIVATE_SH="${PREFIX}/etc/conda/deactivate.d/deactivate_${PKG_NAME}.sh"
+mkdir -p $(dirname ${DEACTIVATE_SH})
+cat > ${DEACTIVATE_SH} << EOF
+#!/bin/bash
+if [ "\${CONDA_BACKUP_${LALSUITE_NAME_UPPER}_DATADIR}" = "empty" ]; then
+ unset ${LALSUITE_NAME_UPPER}_DATADIR
+else
+ export
${LALSUITE_NAME_UPPER}_DATADIR="\${CONDA_BACKUP_${LALSUITE_NAME_UPPER}_DATADIR}"
+fi
+unset CONDA_BACKUP_${LALSUITE_NAME_UPPER}_DATADIR
+EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/conda/install-python.sh
new/lalburst-1.5.8/conda/install-python.sh
--- old/lalburst-1.5.7/conda/install-python.sh 2021-01-27 02:36:30.524519687
+0100
+++ new/lalburst-1.5.8/conda/install-python.sh 2021-02-16 00:25:21.749373442
+0100
@@ -22,6 +22,7 @@
${SRC_DIR}/configure \
--disable-doxygen \
--disable-swig-iface \
+ --enable-help2man \
--enable-python \
--enable-swig-python \
--prefix=$PREFIX \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/conda/meta.yaml.in
new/lalburst-1.5.8/conda/meta.yaml.in
--- old/lalburst-1.5.7/conda/meta.yaml.in 2021-01-27 17:14:45.905823250
+0100
+++ new/lalburst-1.5.8/conda/meta.yaml.in 2021-02-18 18:14:35.372721765
+0100
@@ -5,20 +5,27 @@
# production-ready at any time.
{% set name = "lalburst" %}
-{% set version = "1.5.7".replace('-', '.') %}
-{% set url = "file://@TARBALL@" %}
-{% set sha256 = "@SHA256@" %}
+
+# set version based on nightly
+# (we rebuild the nightly version ourselves because the tarball might have
+# been generate on a different day)
+{% set base_version = "1.5.8" %}
+{% set nightly_version = "" %}
+{% if nightly_version %}
+{% set version = base_version + "-dev" +
datetime.datetime.utcnow().strftime("%Y%m%d") %}
+{% else %}
+{% set version = base_version %}
+{% endif %}
# dependencies
{% set lal_version = "7.1.0a0" %}
{% set lalmetaio_version = "2.0.0a0" %}
{% set lalsimulation_version = "2.5.0a0" %}
{% set swig_version = "3.0.10" %}
-{% set numpy_version = "1.7" %}
package:
name: {{ name }}-split
- version: {{ version }}
+ version: {{ version|replace('-', '.') }}
source:
url: file://@TARBALL@
@@ -69,11 +76,15 @@
- liblalmetaio >={{ lalmetaio_version }}
- liblalsimulation >={{ lalsimulation_version }}
- metaio
+ run_constrained:
+ - lalburst >=1.5.7
+ - python-lalburst >=1.5.7
test:
requires:
- pkg-config
commands:
- - test $(pkg-config --modversion --print-errors lalburst) == "1.5.7"
+ - pkg-config --print-errors --exact-version "{{ version }}" lalburst
+ - test -f ${PREFIX}/lib/liblalburst${SHLIB_EXT} # [not win]
about:
home: https://wiki.ligo.org/Computing/LALSuite
doc_url: https://lscsoft.docs.ligo.org/lalsuite/lalframe/
@@ -98,10 +109,12 @@
requirements:
build:
- {{ compiler('c') }}
+ - help2man >=1.37
- make
- pkg-config >=0.18.0
- swig >={{ swig_version }}
host:
+ - gsl
- {{ pin_subpackage('liblalburst', exact=True) }}
- lscsoft-glue
- numpy
@@ -112,14 +125,11 @@
- scipy
run:
- gsl
- - liblal >={{ lal_version }}
+ - liblal # [linux]
- {{ pin_subpackage('liblalburst', exact=True) }}
- - liblalmetaio
- - liblalsimulation
- ligo-segments
- lscsoft-glue
- matplotlib
- - metaio
- {{ pin_compatible('numpy') }}
- python
- python-lal >={{ lal_version }}
@@ -172,6 +182,7 @@
requirements:
build:
- {{ compiler('c') }}
+ - help2man >=1.37
- make
host:
- liblal >={{ lal_version }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/conda/meta.yaml.in.in
new/lalburst-1.5.8/conda/meta.yaml.in.in
--- old/lalburst-1.5.7/conda/meta.yaml.in.in 2021-01-27 03:45:33.570679613
+0100
+++ new/lalburst-1.5.8/conda/meta.yaml.in.in 2021-02-16 19:02:22.054772702
+0100
@@ -5,20 +5,27 @@
# production-ready at any time.
{% set name = "lalburst" %}
-{% set version = "@VERSION@".replace('-', '.') %}
-{% set url = "file://@TARBALL@" %}
-{% set sha256 = "@SHA256@" %}
+
+# set version based on nightly
+# (we rebuild the nightly version ourselves because the tarball might have
+# been generate on a different day)
+{% set base_version = "@BASE_VERSION@" %}
+{% set nightly_version = "@NIGHTLY_VERSION@" %}
+{% if nightly_version %}
+{% set version = base_version + "-dev" +
datetime.datetime.utcnow().strftime("%Y%m%d") %}
+{% else %}
+{% set version = base_version %}
+{% endif %}
# dependencies
{% set lal_version = "@MIN_LAL_VERSION@a0" %}
{% set lalmetaio_version = "@MIN_LALMETAIO_VERSION@a0" %}
{% set lalsimulation_version = "@MIN_LALSIMULATION_VERSION@a0" %}
{% set swig_version = "@MIN_SWIG_VERSION@" %}
-{% set numpy_version = "@MIN_NUMPY_VERSION@" %}
package:
name: {{ name }}-split
- version: {{ version }}
+ version: {{ version|replace('-', '.') }}
source:
url: file://@TARBALL@
@@ -69,11 +76,15 @@
- liblalmetaio >={{ lalmetaio_version }}
- liblalsimulation >={{ lalsimulation_version }}
- metaio
+ run_constrained:
+ - lalburst >=1.5.7
+ - python-lalburst >=1.5.7
test:
requires:
- pkg-config
commands:
- - test $(pkg-config --modversion --print-errors lalburst) ==
"@VERSION@"
+ - pkg-config --print-errors --exact-version "{{ version }}" lalburst
+ - test -f ${PREFIX}/lib/liblalburst${SHLIB_EXT} # [not win]
about:
home: https://wiki.ligo.org/Computing/LALSuite
doc_url: https://lscsoft.docs.ligo.org/lalsuite/lalframe/
@@ -98,10 +109,12 @@
requirements:
build:
- {{ compiler('c') }}
+ - help2man >=1.37
- make
- pkg-config >=0.18.0
- swig >={{ swig_version }}
host:
+ - gsl
- {{ pin_subpackage('liblalburst', exact=True) }}
- lscsoft-glue
- numpy
@@ -112,14 +125,11 @@
- scipy
run:
- gsl
- - liblal >={{ lal_version }}
+ - liblal # [linux]
- {{ pin_subpackage('liblalburst', exact=True) }}
- - liblalmetaio
- - liblalsimulation
- ligo-segments
- lscsoft-glue
- matplotlib
- - metaio
- {{ pin_compatible('numpy') }}
- python
- python-lal >={{ lal_version }}
@@ -172,6 +182,7 @@
requirements:
build:
- {{ compiler('c') }}
+ - help2man >=1.37
- make
host:
- liblal >={{ lal_version }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/configure new/lalburst-1.5.8/configure
--- old/lalburst-1.5.7/configure 2021-01-27 17:14:38.334648024 +0100
+++ new/lalburst-1.5.8/configure 2021-02-18 18:14:28.419559026 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for LALBurst 1.5.7.
+# Generated by GNU Autoconf 2.69 for LALBurst 1.5.8.
#
# Report bugs to <lal-disc...@ligo.org>.
#
@@ -650,8 +650,8 @@
# Identity of this package.
PACKAGE_NAME='LALBurst'
PACKAGE_TARNAME='lalburst'
-PACKAGE_VERSION='1.5.7'
-PACKAGE_STRING='LALBurst 1.5.7'
+PACKAGE_VERSION='1.5.8'
+PACKAGE_STRING='LALBurst 1.5.8'
PACKAGE_BUGREPORT='lal-disc...@ligo.org'
PACKAGE_URL=''
@@ -1579,7 +1579,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures LALBurst 1.5.7 to adapt to many kinds of systems.
+\`configure' configures LALBurst 1.5.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1649,7 +1649,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of LALBurst 1.5.7:";;
+ short | recursive ) echo "Configuration of LALBurst 1.5.8:";;
esac
cat <<\_ACEOF
@@ -1865,7 +1865,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-LALBurst configure 1.5.7
+LALBurst configure 1.5.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2561,7 +2561,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by LALBurst $as_me 1.5.7, which was
+It was created by LALBurst $as_me 1.5.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2976,7 +2976,7 @@
# then set age to 0.
LIBCURRENT=6
-LIBREVISION=2
+LIBREVISION=3
LIBAGE=0
@@ -3480,7 +3480,7 @@
# Define the identity of the package.
PACKAGE='lalburst'
- VERSION='1.5.7'
+ VERSION='1.5.8'
cat >>confdefs.h <<_ACEOF
@@ -10625,7 +10625,7 @@
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
10.[012][,.]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined
${wl}suppress' ;;
- 10.*)
+ 10.*|11.*)
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
@@ -14831,7 +14831,7 @@
/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) ||
(__GNUC__ > 3))
-int fnord () __attribute__ ((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
int fnord () { return 42; }
@@ -14937,7 +14937,7 @@
/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) ||
(__GNUC__ > 3))
-int fnord () __attribute__ ((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
int fnord () { return 42; }
@@ -21791,7 +21791,7 @@
Report bugs to <bug-libt...@gnu.org>."
lt_cl_version="\
-LALBurst config.lt 1.5.7
+LALBurst config.lt 1.5.8
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -30579,7 +30579,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by LALBurst $as_me 1.5.7, which was
+This file was extended by LALBurst $as_me 1.5.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30645,7 +30645,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-LALBurst config.status 1.5.7
+LALBurst config.status 1.5.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/configure.ac
new/lalburst-1.5.8/configure.ac
--- old/lalburst-1.5.7/configure.ac 2021-01-27 17:14:30.527467332 +0100
+++ new/lalburst-1.5.8/configure.ac 2021-02-18 18:14:22.536421332 +0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.63])
-AC_INIT([LALBurst],[1.5.7],[lal-disc...@ligo.org])
+AC_INIT([LALBurst],[1.5.8],[lal-disc...@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALBurstConfig.h])
AC_CONFIG_SRCDIR([lib/EPSearch.c])
AC_CONFIG_AUX_DIR([gnuscripts])
@@ -20,7 +20,7 @@
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT],[6])
-AC_SUBST([LIBREVISION],[2])
+AC_SUBST([LIBREVISION],[3])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
AS_CASE([${host_os}],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/debian/changelog
new/lalburst-1.5.8/debian/changelog
--- old/lalburst-1.5.7/debian/changelog 2021-01-27 17:14:30.527467332 +0100
+++ new/lalburst-1.5.8/debian/changelog 2021-02-18 18:14:22.536421332 +0100
@@ -1,3 +1,9 @@
+lalburst (1.5.8-1) unstable; urgency=low
+
+ * Update for 1.5.8
+
+ -- Adam Mercer <adam.mer...@ligo.org> Fri, 05 Feb 2021 14:14:37 -0700
+
lalburst (1.5.7-1) unstable; urgency=low
* Update for 1.5.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/debian/control
new/lalburst-1.5.8/debian/control
--- old/lalburst-1.5.7/debian/control 2021-01-27 17:14:45.927823760 +0100
+++ new/lalburst-1.5.8/debian/control 2021-02-18 18:14:35.400722420 +0100
@@ -39,8 +39,8 @@
python3-matplotlib,
python3-pytest,
python3-scipy,
+ rsync,
swig (>= 3.0.10) | swig3.0 (>= 3.0.10),
- zlib1g-dev,
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.5
Standards-Version: 3.9.8
@@ -69,7 +69,6 @@
libgsl-dev | libgsl0-dev (>= 1.9),
liblalburst6 (= ${binary:Version}),
libmetaio-dev (>= 8.2),
- zlib1g,
Description: LSC Algorithm Library Burst Developers
The LSC Algorithm Burst Library for gravitational wave data analysis.
This package contains files needed build applications that use the LAL
@@ -160,7 +159,7 @@
${misc:Depends},
${shlibs:Depends},
liblalburst6 (= ${binary:Version}),
- python-lalburst (= ${binary:Version}),
+ python3-lalburst (= ${binary:Version}),
Description: LSC Algorithm Library Burst
The LSC Algorithm Burst Library for gravitational wave data analysis.
This package provides the runtime tools.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/debian/control.in
new/lalburst-1.5.8/debian/control.in
--- old/lalburst-1.5.7/debian/control.in 2021-01-27 03:45:33.571679635
+0100
+++ new/lalburst-1.5.8/debian/control.in 2021-02-11 02:06:07.568965652
+0100
@@ -39,8 +39,8 @@
python3-matplotlib,
python3-pytest,
python3-scipy,
+ rsync,
swig (>= @MIN_SWIG_VERSION@) | swig3.0 (>= @MIN_SWIG_VERSION@),
- zlib1g-dev,
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.5
Standards-Version: 3.9.8
@@ -69,7 +69,6 @@
libgsl-dev | libgsl0-dev (>= 1.9),
liblalburst@LIBMAJOR@ (= ${binary:Version}),
libmetaio-dev (>= 8.2),
- zlib1g,
Description: LSC Algorithm Library Burst Developers
The LSC Algorithm Burst Library for gravitational wave data analysis.
This package contains files needed build applications that use the LAL
@@ -160,7 +159,7 @@
${misc:Depends},
${shlibs:Depends},
liblalburst@LIBMAJOR@ (= ${binary:Version}),
- python-lalburst (= ${binary:Version}),
+ python3-lalburst (= ${binary:Version}),
Description: LSC Algorithm Library Burst
The LSC Algorithm Burst Library for gravitational wave data analysis.
This package provides the runtime tools.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/debian/lalsuite.mk
new/lalburst-1.5.8/debian/lalsuite.mk
--- old/lalburst-1.5.7/debian/lalsuite.mk 2021-01-27 03:45:33.567679545
+0100
+++ new/lalburst-1.5.8/debian/lalsuite.mk 2021-02-11 02:06:07.458963035
+0100
@@ -3,16 +3,18 @@
include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/pkg-info.mk
-HAVE_PYTHON2 := $(if $(shell pyversions -r),yes)
-HAVE_PYTHON3 := $(if $(shell py3versions -r),yes)
-HAVE_OCTAVE := $(if $(shell grep $(DEB_SOURCE)-octave debian/control),yes)
+DH_PACKAGES := $(shell dh_listpackages)
+WITH_PYTHON2 := $(if $(filter python-$(DEB_SOURCE),$(DH_PACKAGES)),yes)
+WITH_OCTAVE := $(if $(filter $(DEB_SOURCE)-octave,$(DH_PACKAGES)),yes)
# define 'main' python, and other python
# NOTE: to disable the 'other' python build set 'PYTHON_OTHER = '
# (i.e. to the empty string) _before_ the 'include debian/lalsuite.mk'
# line in debian/rules file
-PYTHON := /usr/bin/python2
-PYTHON_OTHER ?= /usr/bin/python3
+PYTHON := /usr/bin/python3
+ifneq (,$(WITH_PYTHON2))
+ PYTHON_OTHER ?= /usr/bin/python2
+endif
PYTHON_OTHER_BUILD_DIR ?= _buildpyother
# handle parallelism
@@ -23,8 +25,9 @@
%:
dh $@ \
--buildsystem=autoconf \
- $(if $(HAVE_PYTHON2),--with=python2) \
- $(if $(HAVE_PYTHON3),--with=python3)
+ --with=python3 \
+ $(if $(WITH_PYTHON2),--with=python2) \
+ ;
override_dh_auto_configure:
# configure the build for the 'main' python version
@@ -39,6 +42,8 @@
ifneq ($(strip $(PYTHON_OTHER)),)
# -- configure and build 'other' python library
# copy over current build into new directory
+ # NOTE: when this is removed, please remove
+ # 'rsync' from Build-Depends
$(RM) -r $(PYTHON_OTHER_BUILD_DIR)
rsync -ra . $(PYTHON_OTHER_BUILD_DIR)
# remove old makefiles
@@ -78,14 +83,15 @@
endif
override_dh_fixperms:
- dh_fixperms $(if $(HAVE_OCTAVE),&& find debian -name '*.oct' | xargs
chmod -x)
+ dh_fixperms $(if $(WITH_OCTAVE),&& find debian -name '*.oct' | xargs
chmod -x)
override_dh_strip:
- dh_strip $(if $(HAVE_OCTAVE),&& find debian -name '*.oct' | xargs strip
--strip-unneeded)
+ dh_strip $(if $(WITH_OCTAVE),&& find debian -name '*.oct' | xargs strip
--strip-unneeded)
override_dh_shlibdeps:
dh_shlibdeps \
&& find debian -name '*.la' -delete \
- $(if $(HAVE_OCTAVE),&& dpkg-shlibdeps
-Odebian/$(DEB_SOURCE)-octave.substvars $$(find debian -name '*.oct')) \
- $(if $(HAVE_PYTHON2),&& dh_numpy) \
- $(if $(HAVE_PYTHON3),&& dh_numpy3)
+ && dh_numpy3 \
+ $(if $(WITH_OCTAVE),&& dpkg-shlibdeps
-Odebian/$(DEB_SOURCE)-octave.substvars $$(find debian -name '*.oct')) \
+ $(if $(WITH_PYTHON2),&& dh_numpy) \
+ ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/gnuscripts/config.guess
new/lalburst-1.5.8/gnuscripts/config.guess
--- old/lalburst-1.5.7/gnuscripts/config.guess 2021-01-16 19:10:21.310474999
+0100
+++ new/lalburst-1.5.8/gnuscripts/config.guess 2021-02-16 00:25:21.750373466
+0100
@@ -1283,6 +1283,9 @@
*:Rhapsody:*:*)
echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
exit ;;
+ arm64:Darwin:*:*)
+ echo aarch64-apple-darwin"$UNAME_RELEASE"
+ exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
eval "$set_cc_for_build"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/gnuscripts/config.sub
new/lalburst-1.5.8/gnuscripts/config.sub
--- old/lalburst-1.5.7/gnuscripts/config.sub 2021-01-16 19:10:21.310474999
+0100
+++ new/lalburst-1.5.8/gnuscripts/config.sub 2021-02-16 00:25:21.750373466
+0100
@@ -1263,6 +1263,9 @@
basic_machine=none-none
os=-none
;;
+ arm64-*)
+ cpu=aarch64
+ ;;
# Here we handle the default manufacturer of certain CPU types. It is in
# some cases the only manufacturer, in others, it is the most popular.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/gnuscripts/libtool.m4
new/lalburst-1.5.8/gnuscripts/libtool.m4
--- old/lalburst-1.5.7/gnuscripts/libtool.m4 2021-01-16 19:10:21.311475022
+0100
+++ new/lalburst-1.5.8/gnuscripts/libtool.m4 2021-02-16 00:25:21.750373466
+0100
@@ -1076,7 +1076,7 @@
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
10.[[012]][[,.]]*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined
${wl}suppress' ;;
- 10.*)
+ 10.*|11.*)
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
@@ -1874,7 +1874,7 @@
/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) ||
(__GNUC__ > 3))
-int fnord () __attribute__ ((visibility("default")));
+int fnord () __attribute__((visibility("default")));
#endif
int fnord () { return 42; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/gnuscripts/ltmain.sh
new/lalburst-1.5.8/gnuscripts/ltmain.sh
--- old/lalburst-1.5.7/gnuscripts/ltmain.sh 2021-01-16 19:10:21.312475045
+0100
+++ new/lalburst-1.5.8/gnuscripts/ltmain.sh 2021-02-16 00:25:21.750373466
+0100
@@ -5676,7 +5676,7 @@
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
# define externally_visible volatile
#else
-# define externally_visible __attribute__ ((externally_visible)) volatile
+# define externally_visible __attribute__((externally_visible)) volatile
#endif
externally_visible const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
@@ -7220,6 +7220,11 @@
arg=$func_stripname_result
;;
+ -Wl,--as-needed)
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
@@ -7524,6 +7529,7 @@
case $linkmode in
lib)
+ as_needed_flag=
passes="conv dlpreopen link"
for file in $dlfiles $dlprefiles; do
case $file in
@@ -7535,6 +7541,7 @@
done
;;
prog)
+ as_needed_flag=
compile_deplibs=
finalize_deplibs=
alldeplibs=false
@@ -7604,6 +7611,15 @@
lib=
found=false
case $deplib in
+ -Wl,--as-needed)
+ if test prog,link = "$linkmode,$pass" ||
+ test lib,link = "$linkmode,$pass"; then
+ as_needed_flag="$deplib "
+ else
+ deplibs="$deplib $deplibs"
+ fi
+ continue
+ ;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test prog,link = "$linkmode,$pass"; then
@@ -10021,6 +10037,13 @@
test "X$libobjs" = "X " && libobjs=
fi
+ # A bit hacky. I had wanted to add \$as_needed_flag to archive_cmds
instead, but that
+ # comes from libtool.m4 which is part of the project being built. This
should put it
+ # in the right place though.
+ if test lib,link = "$linkmode,$pass" && test -n "$as_needed_flag"; then
+ libobjs=$as_needed_flag$libobjs
+ fi
+
save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
IFS=$sp$nl
@@ -10253,8 +10276,8 @@
compile_deplibs=$new_libs
- func_append compile_command " $compile_deplibs"
- func_append finalize_command " $finalize_deplibs"
+ func_append compile_command " $as_needed_flag $compile_deplibs"
+ func_append finalize_command " $as_needed_flag $finalize_deplibs"
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/gnuscripts/pkg.m4
new/lalburst-1.5.8/gnuscripts/pkg.m4
--- old/lalburst-1.5.7/gnuscripts/pkg.m4 2021-01-16 19:10:21.073469589
+0100
+++ new/lalburst-1.5.8/gnuscripts/pkg.m4 2021-02-11 02:06:07.458963035
+0100
@@ -15,7 +15,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lalburst.pc
new/lalburst-1.5.8/lalburst.pc
--- old/lalburst-1.5.7/lalburst.pc 2021-01-27 17:14:45.998825403 +0100
+++ new/lalburst-1.5.8/lalburst.pc 2021-02-18 18:14:35.486724433 +0100
@@ -11,7 +11,7 @@
Name: LALBurst
Description: LAL Burst Library Support
-Version: 1.5.7
+Version: 1.5.8
Requires.private: gsl, lal >= 7.1.0, libmetaio, lalmetaio >= 2.0.0,
lalsimulation >= 2.5.0
Libs: -L${libdir} -llalburst
Cflags: -I${includedir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lalburst.spec
new/lalburst-1.5.8/lalburst.spec
--- old/lalburst-1.5.7/lalburst.spec 2021-01-27 17:14:46.007825611 +0100
+++ new/lalburst-1.5.8/lalburst.spec 2021-02-18 18:14:35.495724644 +0100
@@ -7,10 +7,13 @@
%undefine nightly
%endif
+# borrowed from python3-rpm-macros
+%define pyYdir %{_builddir}/pythonY-%{name}-%{version}-%{release}
+
# -- metadata ---------------
Name: lalburst
-Version: 1.5.7
+Version: 1.5.8
Release: %{?nightly:0.%{nightly}}%{!?nightly:%{release}}%{?dist}
Summary: LSC Algorithm Burst Library
License: GPLv2+
@@ -37,6 +40,7 @@
# swig
BuildRequires: swig >= 3.0.10
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
# python2
BuildRequires: pytest
BuildRequires: python-devel
@@ -51,6 +55,8 @@
BuildRequires: python2-numpy >= 1.7
BuildRequires: python2-rpm-macros
BuildRequires: python2-scipy
+BuildRequires: rsync
+%endif
# python3x
BuildRequires: epel-rpm-macros
@@ -78,18 +84,16 @@
# lalburst
Summary: LSC Algorithm Burst Libary - runtime tools
Requires: lib%{name} = %{version}-%{release}
-Requires: python2-%{name} = %{version}-%{release}
+Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release}
%description
The LSC Algorithm Burst Library for gravitational wave data analysis.
This package provides the runtime tools.
%package -n lib%{name}
Summary: LSC Algorithm Burst Library - library package
-Requires: gsl
Requires: liblal >= 7.1.0
Requires: liblalmetaio >= 2.0.0
Requires: liblalsimulation >= 2.5.0
-Requires: libmetaio
Conflicts: %{name} <= 1.5.6-1
%description -n lib%{name}
The LSC Algorithm Burst Library for gravitational wave data analysis.
@@ -107,18 +111,18 @@
Requires: liblalsimulation-devel >= 2.5.0
Requires: libmetaio-devel
Provides: %{name}-devel = %{version}-%{release}
-Obsoletes: %{name}-devel < %{version}-%{release}
+Obsoletes: %{name}-devel < 1.5.7-1
%description -n lib%{name}-devel
The LSC Algorithm Burst Library for gravitational wave data analysis.
This package contains files needed build applications that use the LAL Burst
library.
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
# python2-lalburst
%package -n python2-%{name}
Summary: Python %{python2_version} Bindings for LALBurst
Group: LAL
Requires: lib%{name} = %{version}-%{release}
-Requires: gsl
Requires: python
Requires: python2-glue
Requires: python2-lal >= 7.1.0
@@ -129,18 +133,19 @@
Requires: python2-numpy >= 1.7
Requires: python2-scipy
Provides: %{name}-python = %{version}-%{release}
+Provides: deprecated()
Obsoletes: %{name}-python < %{version}-%{release}
%{?python_provide:%python_provide python2-%{name}}
%description -n python2-%{name}
The LSC Algorithm Library for gravitational wave data analysis.
This package provides the Python %{python2_version} bindings for LALBurst.
+%endif
# python3x-lalburst
%package -n python%{python3_pkgversion}-%{name}
-Summary: Python %{python2_version} Bindings for LALBurst
+Summary: Python %{python3_version} Bindings for LALBurst
Group: LAL
Requires: lib%{name} = %{version}-%{release}
-Requires: gsl
Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-glue
Requires: python%{python3_pkgversion}-lal >= 7.1.0
@@ -174,40 +179,47 @@
%setup -q -n %{name}-%{version}%{?nightly:-%{nightly}}
%build
-# build C library with python2
-%configure %{configure_opts} --disable-gcc-flags --enable-swig
PYTHON=%{__python2}
+# build C library with python3
+%configure %{configure_opts} --disable-gcc-flags --enable-swig
PYTHON=%{__python3}
%{__make} %{?_smp_mflags} V=1
-# build python3 library (copy things so we don't have to rebuild them)
-rm -rf %py3dir
-cp -r . %py3dir
-pushd %py3dir
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
+# build python2 library (copy things so we don't have to rebuild them)
+rm -rf %{pyYdir}
+rsync -ra . %{pyYdir}
+pushd %{pyYdir}
rm -rfv python/%{name}/*.{la,lo,o} python/%{name}/.libs
-%configure %{configure_opts} --disable-doxygen --disable-gcc-flags
--disable-swig-octave --enable-swig-python PYTHON=%{__python3}
+%configure %{configure_opts} --disable-doxygen --disable-gcc-flags
--disable-swig-octave --enable-swig-python PYTHON=%{__python2}
%{__make} V=1 -C swig
%{__make} V=1 -C python/%{name}
%{__make} V=1 -C bin bin_PROGRAMS="" dist_bin_SCRIPTS=""
popd
+%endif
%check
-# C + python2 + octave
+# C + python3 + octave
%{__make} %{?_smp_mflags} V=1 VERBOSE=1 check
-# python3
-[ -d %py3dir/test/python ] && %{__make} %{?_smp_mflags} V=1 VERBOSE=1 -C
%py3dir -C test/python check
+
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
+# python2
+[ -d %pyYdir/test/python ] && %{__make} %{?_smp_mflags} V=1 VERBOSE=1 -C
%pyYdir -C test/python check
+%endif
%install
-# C + python2 + octave
+# C + python3 + octave
%make_install
-# python3
-%{__make} -C %py3dir -C swig install-exec-am DESTDIR=%{?buildroot}
-%{__make} -C %py3dir -C python/%{name} install DESTDIR=%{?buildroot}
+
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
+# python2
+%{__make} -C %pyYdir -C swig install-exec-am DESTDIR=%{?buildroot}
+%{__make} -C %pyYdir -C python/%{name} install DESTDIR=%{?buildroot}
+%endif
+
find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete
-%post
-ldconfig
+%post -n lib%{name} -p /sbin/ldconfig
-%postun
-ldconfig
+%postun -n lib%{name} -p /sbin/ldconfig
%clean
[ ${RPM_BUILD_ROOT} != "/" ] && rm -Rf ${RPM_BUILD_ROOT}
@@ -217,34 +229,44 @@
%files -n lib%{name}
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{_libdir}/*.so.*
%files -n lib%{name}-devel
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{_includedir}/lal
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
%files -n python2-%{name}
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{python2_sitearch}/*
+%exclude %{python2_sitearch}/%{name}/*.a
+%endif
%files -n python%{python3_pkgversion}-%{name}
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{python3_sitearch}/*
+%exclude %{python3_sitearch}/%{name}/*.a
%files octave
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{_prefix}/lib*/octave/*/site/oct/*/lalburst.oct*
%files
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{_bindir}/*
%{_mandir}/man1/*
@@ -254,6 +276,9 @@
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
+* Fri Feb 05 2021 Adam Mercer <adam.mer...@ligo.org> 1.5.8-1
+- Update for 1.5.8
+
* Mon Jan 11 2021 Adam Mercer <adam.mer...@ligo.org> 1.5.7-1
- Update for 1.5.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lalburst.spec.in
new/lalburst-1.5.8/lalburst.spec.in
--- old/lalburst-1.5.7/lalburst.spec.in 2021-01-27 17:14:30.527467332 +0100
+++ new/lalburst-1.5.8/lalburst.spec.in 2021-02-18 18:14:22.536421332 +0100
@@ -7,6 +7,9 @@
%undefine nightly
%endif
+# borrowed from python3-rpm-macros
+%define pyYdir %{_builddir}/pythonY-%{name}-%{version}-%{release}
+
# -- metadata ---------------
Name: @PACKAGE@
@@ -37,6 +40,7 @@
# swig
BuildRequires: swig >= @MIN_SWIG_VERSION@
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
# python2
BuildRequires: pytest
BuildRequires: python-devel
@@ -51,6 +55,8 @@
BuildRequires: python2-numpy >= @MIN_NUMPY_VERSION@
BuildRequires: python2-rpm-macros
BuildRequires: python2-scipy
+BuildRequires: rsync
+%endif
# python3x
BuildRequires: epel-rpm-macros
@@ -78,18 +84,16 @@
# lalburst
Summary: LSC Algorithm Burst Libary - runtime tools
Requires: lib%{name} = %{version}-%{release}
-Requires: python2-%{name} = %{version}-%{release}
+Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release}
%description
The LSC Algorithm Burst Library for gravitational wave data analysis.
This package provides the runtime tools.
%package -n lib%{name}
Summary: LSC Algorithm Burst Library - library package
-Requires: gsl
Requires: liblal >= @MIN_LAL_VERSION@
Requires: liblalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: liblalsimulation >= @MIN_LALSIMULATION_VERSION@
-Requires: libmetaio
Conflicts: %{name} <= 1.5.6-1
%description -n lib%{name}
The LSC Algorithm Burst Library for gravitational wave data analysis.
@@ -107,18 +111,18 @@
Requires: liblalsimulation-devel >= @MIN_LALSIMULATION_VERSION@
Requires: libmetaio-devel
Provides: %{name}-devel = %{version}-%{release}
-Obsoletes: %{name}-devel < %{version}-%{release}
+Obsoletes: %{name}-devel < 1.5.7-1
%description -n lib%{name}-devel
The LSC Algorithm Burst Library for gravitational wave data analysis.
This package contains files needed build applications that use the LAL Burst
library.
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
# python2-lalburst
%package -n python2-%{name}
Summary: Python %{python2_version} Bindings for LALBurst
Group: LAL
Requires: lib%{name} = %{version}-%{release}
-Requires: gsl
Requires: python
Requires: python2-glue
Requires: python2-lal >= @MIN_LAL_VERSION@
@@ -129,18 +133,19 @@
Requires: python2-numpy >= @MIN_NUMPY_VERSION@
Requires: python2-scipy
Provides: %{name}-python = %{version}-%{release}
+Provides: deprecated()
Obsoletes: %{name}-python < %{version}-%{release}
%{?python_provide:%python_provide python2-%{name}}
%description -n python2-%{name}
The LSC Algorithm Library for gravitational wave data analysis.
This package provides the Python %{python2_version} bindings for LALBurst.
+%endif
# python3x-lalburst
%package -n python%{python3_pkgversion}-%{name}
-Summary: Python %{python2_version} Bindings for LALBurst
+Summary: Python %{python3_version} Bindings for LALBurst
Group: LAL
Requires: lib%{name} = %{version}-%{release}
-Requires: gsl
Requires: python%{python3_pkgversion}
Requires: python%{python3_pkgversion}-glue
Requires: python%{python3_pkgversion}-lal >= @MIN_LAL_VERSION@
@@ -174,40 +179,47 @@
%setup -q -n %{name}-%{version}%{?nightly:-%{nightly}}
%build
-# build C library with python2
-%configure %{configure_opts} --disable-gcc-flags --enable-swig
PYTHON=%{__python2}
+# build C library with python3
+%configure %{configure_opts} --disable-gcc-flags --enable-swig
PYTHON=%{__python3}
%{__make} %{?_smp_mflags} V=1
-# build python3 library (copy things so we don't have to rebuild them)
-rm -rf %py3dir
-cp -r . %py3dir
-pushd %py3dir
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
+# build python2 library (copy things so we don't have to rebuild them)
+rm -rf %{pyYdir}
+rsync -ra . %{pyYdir}
+pushd %{pyYdir}
rm -rfv python/%{name}/*.{la,lo,o} python/%{name}/.libs
-%configure %{configure_opts} --disable-doxygen --disable-gcc-flags
--disable-swig-octave --enable-swig-python PYTHON=%{__python3}
+%configure %{configure_opts} --disable-doxygen --disable-gcc-flags
--disable-swig-octave --enable-swig-python PYTHON=%{__python2}
%{__make} V=1 -C swig
%{__make} V=1 -C python/%{name}
%{__make} V=1 -C bin bin_PROGRAMS="" dist_bin_SCRIPTS=""
popd
+%endif
%check
-# C + python2 + octave
+# C + python3 + octave
%{__make} %{?_smp_mflags} V=1 VERBOSE=1 check
-# python3
-[ -d %py3dir/test/python ] && %{__make} %{?_smp_mflags} V=1 VERBOSE=1 -C
%py3dir -C test/python check
+
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
+# python2
+[ -d %pyYdir/test/python ] && %{__make} %{?_smp_mflags} V=1 VERBOSE=1 -C
%pyYdir -C test/python check
+%endif
%install
-# C + python2 + octave
+# C + python3 + octave
%make_install
-# python3
-%{__make} -C %py3dir -C swig install-exec-am DESTDIR=%{?buildroot}
-%{__make} -C %py3dir -C python/%{name} install DESTDIR=%{?buildroot}
+
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
+# python2
+%{__make} -C %pyYdir -C swig install-exec-am DESTDIR=%{?buildroot}
+%{__make} -C %pyYdir -C python/%{name} install DESTDIR=%{?buildroot}
+%endif
+
find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete
-%post
-ldconfig
+%post -n lib%{name} -p /sbin/ldconfig
-%postun
-ldconfig
+%postun -n lib%{name} -p /sbin/ldconfig
%clean
[ ${RPM_BUILD_ROOT} != "/" ] && rm -Rf ${RPM_BUILD_ROOT}
@@ -217,34 +229,44 @@
%files -n lib%{name}
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{_libdir}/*.so.*
%files -n lib%{name}-devel
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{_includedir}/lal
%{_libdir}/*.a
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
+%if 0%{?rhel} != 0 && 0%{?rhel} < 8
%files -n python2-%{name}
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{python2_sitearch}/*
+%exclude %{python2_sitearch}/%{name}/*.a
+%endif
%files -n python%{python3_pkgversion}-%{name}
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{python3_sitearch}/*
+%exclude %{python3_sitearch}/%{name}/*.a
%files octave
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{_prefix}/lib*/octave/*/site/oct/*/lalburst.oct*
%files
%defattr(-,root,root)
+%doc README.md
%license COPYING
%{_bindir}/*
%{_mandir}/man1/*
@@ -254,6 +276,9 @@
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
+* Fri Feb 05 2021 Adam Mercer <adam.mer...@ligo.org> 1.5.8-1
+- Update for 1.5.8
+
* Mon Jan 11 2021 Adam Mercer <adam.mer...@ligo.org> 1.5.7-1
- Update for 1.5.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/GenerateBurst.c
new/lalburst-1.5.8/lib/GenerateBurst.c
--- old/lalburst-1.5.7/lib/GenerateBurst.c 2021-01-16 19:10:21.313475068
+0100
+++ new/lalburst-1.5.8/lib/GenerateBurst.c 2021-02-11 02:06:07.568965652
+0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License along
* with with program; see the file COPYING. If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/GenerateBurst.h
new/lalburst-1.5.8/lib/GenerateBurst.h
--- old/lalburst-1.5.7/lib/GenerateBurst.h 2021-01-16 19:10:21.313475068
+0100
+++ new/lalburst-1.5.8/lib/GenerateBurst.h 2021-02-11 02:06:07.568965652
+0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
-* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-* MA 02111-1307 USA
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301 USA
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/LALBurstConfig.h
new/lalburst-1.5.8/lib/LALBurstConfig.h
--- old/lalburst-1.5.7/lib/LALBurstConfig.h 2021-01-27 17:14:46.198830031
+0100
+++ new/lalburst-1.5.8/lib/LALBurstConfig.h 2021-02-17 16:09:15.194200570
+0100
@@ -3,7 +3,7 @@
#ifndef LALBURST_VERSION
/* LALBurst Version */
-#define LALBURST_VERSION "1.5.7"
+#define LALBURST_VERSION "1.5.8"
/* LALBurst Version Major Number */
#define LALBURST_VERSION_MAJOR 1
@@ -12,7 +12,7 @@
#define LALBURST_VERSION_MINOR 5
/* LALBurst Version Micro Number */
-#define LALBURST_VERSION_MICRO 7
+#define LALBURST_VERSION_MICRO 8
/* LALBurst Version Devel Number */
#define LALBURST_VERSION_DEVEL 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/LALBurstVCSInfo.c.in
new/lalburst-1.5.8/lib/LALBurstVCSInfo.c.in
--- old/lalburst-1.5.7/lib/LALBurstVCSInfo.c.in 2021-01-16 19:10:21.080469749
+0100
+++ new/lalburst-1.5.8/lib/LALBurstVCSInfo.c.in 2021-02-11 02:06:07.460963083
+0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/LALBurstVCSInfo.h
new/lalburst-1.5.8/lib/LALBurstVCSInfo.h
--- old/lalburst-1.5.7/lib/LALBurstVCSInfo.h 2021-01-27 17:14:46.067827000
+0100
+++ new/lalburst-1.5.8/lib/LALBurstVCSInfo.h 2021-02-18 18:14:35.568726352
+0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifndef _LALBURSTVCSINFO_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/LALBurstVCSInfo.h.in
new/lalburst-1.5.8/lib/LALBurstVCSInfo.h.in
--- old/lalburst-1.5.7/lib/LALBurstVCSInfo.h.in 2021-01-16 19:10:21.080469749
+0100
+++ new/lalburst-1.5.8/lib/LALBurstVCSInfo.h.in 2021-02-11 02:06:07.460963083
+0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
#ifndef _@PACKAGE_NAME_UCASE@VCSINFO_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/LALBurstVCSInfoHeader.h
new/lalburst-1.5.8/lib/LALBurstVCSInfoHeader.h
--- old/lalburst-1.5.7/lib/LALBurstVCSInfoHeader.h 2021-01-27
17:14:46.601839359 +0100
+++ new/lalburst-1.5.8/lib/LALBurstVCSInfoHeader.h 2021-02-18
18:14:36.204741238 +0100
@@ -14,8 +14,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
*/
/*
@@ -36,10 +36,10 @@
#endif
/* VCS information */
-#define LALBURST_VCS_ID "ae506524cfdd73c8a23f01e1b8da8c1c25d9dba5"
-#define LALBURST_VCS_DATE "2021-01-26 20:36:34 +0000"
+#define LALBURST_VCS_ID "2062d7b514d0ebab1f013813869549a63013a0cc"
+#define LALBURST_VCS_DATE "2021-02-17 22:39:50 +0000"
#define LALBURST_VCS_BRANCH "None"
-#define LALBURST_VCS_TAG "lalburst-v1.5.7"
+#define LALBURST_VCS_TAG "lalburst-v1.5.8"
#define LALBURST_VCS_AUTHOR "Adam Mercer <adam.mer...@ligo.org>"
#define LALBURST_VCS_COMMITTER "Adam Mercer <adam.mer...@ligo.org>"
#define LALBURST_VCS_CLEAN "CLEAN"
@@ -47,7 +47,7 @@
#if LALBURST_VERSION_DEVEL != 0
/* VCS header/library mismatch link check function */
-#define LALBURST_VCS_LINK_CHECK
LALBURST_CLEAN_ae506524cfdd73c8a23f01e1b8da8c1c25d9dba5_VCS_HEADER_LIBRARY_MISMATCH
+#define LALBURST_VCS_LINK_CHECK
LALBURST_CLEAN_2062d7b514d0ebab1f013813869549a63013a0cc_VCS_HEADER_LIBRARY_MISMATCH
void LALBURST_VCS_LINK_CHECK(void);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/LIGOLwXMLBurstRead.c
new/lalburst-1.5.8/lib/LIGOLwXMLBurstRead.c
--- old/lalburst-1.5.7/lib/LIGOLwXMLBurstRead.c 2021-01-16 19:10:21.313475068
+0100
+++ new/lalburst-1.5.8/lib/LIGOLwXMLBurstRead.c 2021-02-11 02:06:07.568965652
+0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License along
* with with program; see the file COPYING. If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
#include <stdlib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/LIGOLwXMLBurstRead.h
new/lalburst-1.5.8/lib/LIGOLwXMLBurstRead.h
--- old/lalburst-1.5.7/lib/LIGOLwXMLBurstRead.h 2021-01-16 19:10:21.313475068
+0100
+++ new/lalburst-1.5.8/lib/LIGOLwXMLBurstRead.h 2021-02-11 02:06:07.568965652
+0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License along
* with with program; see the file COPYING. If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
#ifndef _LIGOLWXMLBURSTREAD_H_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/SnglBurstUtils.c
new/lalburst-1.5.8/lib/SnglBurstUtils.c
--- old/lalburst-1.5.7/lib/SnglBurstUtils.c 2021-01-16 19:10:21.313475068
+0100
+++ new/lalburst-1.5.8/lib/SnglBurstUtils.c 2021-02-11 02:06:07.568965652
+0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
-* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-* MA 02111-1307 USA
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301 USA
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/SnglBurstUtils.h
new/lalburst-1.5.8/lib/SnglBurstUtils.h
--- old/lalburst-1.5.7/lib/SnglBurstUtils.h 2021-01-16 19:10:21.313475068
+0100
+++ new/lalburst-1.5.8/lib/SnglBurstUtils.h 2021-02-11 02:06:07.568965652
+0100
@@ -11,8 +11,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
-* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-* MA 02111-1307 USA
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301 USA
*/
#ifndef _LIGOMETADATABURSTUTILS_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/cs_cosmo.h
new/lalburst-1.5.8/lib/cs_cosmo.h
--- old/lalburst-1.5.7/lib/cs_cosmo.h 2021-01-16 19:10:21.313475068 +0100
+++ new/lalburst-1.5.8/lib/cs_cosmo.h 2021-02-11 02:06:07.568965652 +0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
-* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-* MA 02111-1307 USA
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301 USA
*/
/*********************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/cs_lambda_cosmo.c
new/lalburst-1.5.8/lib/cs_lambda_cosmo.c
--- old/lalburst-1.5.7/lib/cs_lambda_cosmo.c 2021-01-16 19:10:21.313475068
+0100
+++ new/lalburst-1.5.8/lib/cs_lambda_cosmo.c 2021-02-11 02:06:07.569965676
+0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
-* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-* MA 02111-1307 USA
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301 USA
*/
/*********************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/lib/cs_lambda_cosmo.h
new/lalburst-1.5.8/lib/cs_lambda_cosmo.h
--- old/lalburst-1.5.7/lib/cs_lambda_cosmo.h 2021-01-16 19:10:21.313475068
+0100
+++ new/lalburst-1.5.8/lib/cs_lambda_cosmo.h 2021-02-11 02:06:07.569965676
+0100
@@ -13,8 +13,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
-* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-* MA 02111-1307 USA
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301 USA
*/
/*********************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/python/lalburst/Makefile.am
new/lalburst-1.5.8/python/lalburst/Makefile.am
--- old/lalburst-1.5.7/python/lalburst/Makefile.am 2021-01-16
19:10:21.313475068 +0100
+++ new/lalburst-1.5.8/python/lalburst/Makefile.am 2021-02-11
02:06:07.569965676 +0100
@@ -36,8 +36,8 @@
cs_gamma.la
cs_gamma_la_SOURCES = cs_gamma.c
cs_gamma_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CPPFLAGS)
-cs_gamma_la_CFLAGS = $(AM_CFLAGS) $(SWIG_PYTHON_CFLAGS) $(GSL_CFLAGS)
$(LAL_CFLAGS) -Wno-cast-qual
-cs_gamma_la_LDFLAGS = $(top_builddir)/lib/liblalburst.la $(AM_LDFLAGS) $(LIBS)
$(GSL_LIBS) $(LAL_LIBS) -module -avoid-version
+cs_gamma_la_CFLAGS = $(AM_CFLAGS) $(SWIG_PYTHON_CFLAGS) $(GSL_CFLAGS)
-Wno-cast-qual
+cs_gamma_la_LDFLAGS = $(top_builddir)/lib/liblalburst.la $(AM_LDFLAGS)
$(GSL_LIBS) -module -avoid-version
endif
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/python/lalburst/Makefile.in
new/lalburst-1.5.8/python/lalburst/Makefile.in
--- old/lalburst-1.5.7/python/lalburst/Makefile.in 2021-01-27
17:14:40.047687670 +0100
+++ new/lalburst-1.5.8/python/lalburst/Makefile.in 2021-02-18
18:14:30.237601577 +0100
@@ -495,8 +495,8 @@
@HAVE_PYTHON_TRUE@@SWIG_BUILD_PYTHON_TRUE@cs_gamma_la_SOURCES = cs_gamma.c
@HAVE_PYTHON_TRUE@@SWIG_BUILD_PYTHON_TRUE@cs_gamma_la_CPPFLAGS =
$(AM_CPPFLAGS) $(SWIG_PYTHON_CPPFLAGS)
-@HAVE_PYTHON_TRUE@@SWIG_BUILD_PYTHON_TRUE@cs_gamma_la_CFLAGS = $(AM_CFLAGS)
$(SWIG_PYTHON_CFLAGS) $(GSL_CFLAGS) $(LAL_CFLAGS) -Wno-cast-qual
-@HAVE_PYTHON_TRUE@@SWIG_BUILD_PYTHON_TRUE@cs_gamma_la_LDFLAGS =
$(top_builddir)/lib/liblalburst.la $(AM_LDFLAGS) $(LIBS) $(GSL_LIBS)
$(LAL_LIBS) -module -avoid-version
+@HAVE_PYTHON_TRUE@@SWIG_BUILD_PYTHON_TRUE@cs_gamma_la_CFLAGS = $(AM_CFLAGS)
$(SWIG_PYTHON_CFLAGS) $(GSL_CFLAGS) -Wno-cast-qual
+@HAVE_PYTHON_TRUE@@SWIG_BUILD_PYTHON_TRUE@cs_gamma_la_LDFLAGS =
$(top_builddir)/lib/liblalburst.la $(AM_LDFLAGS) $(GSL_LIBS) -module
-avoid-version
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/python/lalburst/__init__.py
new/lalburst-1.5.8/python/lalburst/__init__.py
--- old/lalburst-1.5.7/python/lalburst/__init__.py 2021-01-27
17:14:46.045826491 +0100
+++ new/lalburst-1.5.8/python/lalburst/__init__.py 2021-02-18
18:14:35.537725626 +0100
@@ -1,7 +1,7 @@
# Import SWIG wrappings, if available
from .lalburst import *
-__version__ = "1.5.7"
+__version__ = "1.5.8"
## \addtogroup lalburst_python
"""This package provides Python wrappings and extensions to LALBurst"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/python/lalburst/cs_gamma.c
new/lalburst-1.5.8/python/lalburst/cs_gamma.c
--- old/lalburst-1.5.7/python/lalburst/cs_gamma.c 2021-01-16
19:10:21.314475090 +0100
+++ new/lalburst-1.5.8/python/lalburst/cs_gamma.c 2021-02-11
02:06:07.569965676 +0100
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the
-* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-* MA 02111-1307 USA
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+* MA 02110-1301 USA
*/
/*********************************************************************************/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/python/lalburst/git_version.py
new/lalburst-1.5.8/python/lalburst/git_version.py
--- old/lalburst-1.5.7/python/lalburst/git_version.py 2021-01-27
17:14:46.996848501 +0100
+++ new/lalburst-1.5.8/python/lalburst/git_version.py 2021-02-18
18:14:36.603750577 +0100
@@ -17,13 +17,13 @@
#
# You should have received a copy of the GNU General Public License
# along with with program; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
-id = "ae506524cfdd73c8a23f01e1b8da8c1c25d9dba5"
-date = "2021-01-26 20:36:34 +0000"
+id = "2062d7b514d0ebab1f013813869549a63013a0cc"
+date = "2021-02-17 22:39:50 +0000"
branch = "None"
-tag = "lalburst-v1.5.7"
+tag = "lalburst-v1.5.8"
if tag == "None":
tag = None
author = "Adam Mercer <adam.mer...@ligo.org>"
@@ -32,8 +32,8 @@
status = "CLEAN: All modifications committed"
version = id
verbose_msg = """Branch: None
-Tag: lalburst-v1.5.7
-Id: ae506524cfdd73c8a23f01e1b8da8c1c25d9dba5
+Tag: lalburst-v1.5.8
+Id: 2062d7b514d0ebab1f013813869549a63013a0cc
Builder: Adam Mercer <adam.mer...@ligo.org>
Repository status: CLEAN: All modifications committed"""
@@ -54,9 +54,9 @@
"""
if onmismatch not in ("raise", "warn"):
raise ValueError(onmismatch + " is an unrecognized value of
onmismatch")
- if foreign_id == "ae506524cfdd73c8a23f01e1b8da8c1c25d9dba5":
+ if foreign_id == "2062d7b514d0ebab1f013813869549a63013a0cc":
return
- msg = "Program id (ae506524cfdd73c8a23f01e1b8da8c1c25d9dba5) does not
match given id (%s)." % foreign_id
+ msg = "Program id (2062d7b514d0ebab1f013813869549a63013a0cc) does not
match given id (%s)." % foreign_id
if onmismatch == "raise":
raise VersionMismatchError(msg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/swig/SWIGLALBurstAlpha.i
new/lalburst-1.5.8/swig/SWIGLALBurstAlpha.i
--- old/lalburst-1.5.7/swig/SWIGLALBurstAlpha.i 2021-01-16 19:10:21.315475113
+0100
+++ new/lalburst-1.5.8/swig/SWIGLALBurstAlpha.i 2021-02-11 02:06:07.569965676
+0100
@@ -13,8 +13,8 @@
//
// You should have received a copy of the GNU General Public License
// along with with program; see the file COPYING. If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-// MA 02111-1307 USA
+// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+// MA 02110-1301 USA
//
///
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/swig/SWIGLALBurstOmega.i
new/lalburst-1.5.8/swig/SWIGLALBurstOmega.i
--- old/lalburst-1.5.7/swig/SWIGLALBurstOmega.i 2021-01-16 19:10:21.315475113
+0100
+++ new/lalburst-1.5.8/swig/SWIGLALBurstOmega.i 2021-02-11 02:06:07.569965676
+0100
@@ -13,8 +13,8 @@
//
// You should have received a copy of the GNU General Public License
// along with with program; see the file COPYING. If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-// MA 02111-1307 USA
+// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+// MA 02110-1301 USA
//
///
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/swig/SWIGLALBurstTest.h
new/lalburst-1.5.8/swig/SWIGLALBurstTest.h
--- old/lalburst-1.5.7/swig/SWIGLALBurstTest.h 2021-01-16 19:10:21.315475113
+0100
+++ new/lalburst-1.5.8/swig/SWIGLALBurstTest.h 2021-02-11 02:06:07.569965676
+0100
@@ -13,8 +13,8 @@
//
// You should have received a copy of the GNU General Public License
// along with with program; see the file COPYING. If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-// MA 02111-1307 USA
+// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+// MA 02110-1301 USA
//
// Code for SWIG tests of the LALBurst bindings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/swig/SWIGTest.c
new/lalburst-1.5.8/swig/SWIGTest.c
--- old/lalburst-1.5.7/swig/SWIGTest.c 2021-01-16 19:10:21.315475113 +0100
+++ new/lalburst-1.5.8/swig/SWIGTest.c 2021-02-11 02:06:07.569965676 +0100
@@ -13,8 +13,8 @@
//
// You should have received a copy of the GNU General Public License
// along with with program; see the file COPYING. If not, write to the
-// Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-// MA 02111-1307 USA
+// Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+// MA 02110-1301 USA
//
// Code for SWIG tests of the LALBurst bindings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lalburst-1.5.7/swig/generate_swig_iface.py
new/lalburst-1.5.8/swig/generate_swig_iface.py
--- old/lalburst-1.5.7/swig/generate_swig_iface.py 2021-01-16
19:10:21.707484062 +0100
+++ new/lalburst-1.5.8/swig/generate_swig_iface.py 2021-02-11
02:06:07.674968174 +0100
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with with program; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
"""Generate the swig<package>.i interface file for a given LAL subpackage
