Merge branch 'update-packaging-for-rl8' into 'master'

Update packaging for RL8

See merge request !2157

lalapps/lalapps.spec.in

@@ -53,7 +53,7 @@ Requires: lalsimulation >= @MIN_LALSIMULATION_VERSION@
 Requires: less
 Requires: libframel >= @MIN_FRAMEL_VERSION@
 Requires: libmetaio >= @MIN_METAIO_VERSION@
-Requires: python
+Requires: python%{python3_pkgversion}
 Requires: python%{python3_pkgversion}-h5py
 Requires: python%{python3_pkgversion}-lal >= @MIN_LAL_VERSION@
 Requires: python%{python3_pkgversion}-lalframe >= @MIN_LALFRAME_VERSION@

lalinference/lalinference.spec.in

 %define nightly @NIGHTLY_VERSION@%{nil}
 %define _sysconfdir %{_prefix}/etc
 %define release 1
-%define configure_opts --enable-openmp --enable-mpi MPICC=/usr/lib64/openmpi/bin/mpicc
+%define configure_opts %{nil}
 
 %if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
 %undefine nightly
@@ -32,7 +32,6 @@ BuildRequires: liblalsimulation-devel >= @MIN_LALSIMULATION_VERSION@
 BuildRequires: liblalburst-devel >= @MIN_LALBURST_VERSION@
 BuildRequires: liblalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@
 BuildRequires: make
-BuildRequires: openmpi-devel
 BuildRequires: pkgconfig >= 0.18.0
 
 # swig
@@ -133,7 +132,6 @@ Requires: python%{python3_pkgversion}
 Requires: python%{python3_pkgversion}-astropy >= 1.1.1
 Requires: python%{python3_pkgversion}-glue >= @MIN_GLUE_VERSION@
 Requires: python%{python3_pkgversion}-gwdatafind
-Requires: python%{python3_pkgversion}-gwpy
 Requires: python%{python3_pkgversion}-healpy >= 1.9.1
 Requires: python%{python3_pkgversion}-h5py
 Requires: python%{python3_pkgversion}-lal >= @MIN_LAL_VERSION@

lalpulsar/lalpulsar.spec.in

 %define nightly @NIGHTLY_VERSION@%{nil}
 %define _sysconfdir %{_prefix}/etc
 %define release 1
-%define configure_opts --enable-cfitsio CFITSIO_LIBS="-lcfitsio"
+%define configure_opts --enable-cfitsio CFITSIO_LIBS="-lcfitsio" --disable-sistr
 
 %if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
 %undefine nightly
@@ -22,7 +22,6 @@ Prefix: %{_prefix}
 
 # C
 BuildRequires: bc
-BuildRequires: cds-crtools-devel
 BuildRequires: cfitsio-devel
 BuildRequires: fftw-devel
 BuildRequires: gcc
@@ -64,7 +63,6 @@ BuildRequires: lalinference-octave >= @MIN_LALINFERENCE_VERSION@
 
 # lalpulsar
 Summary: LSC Algorithm Pulsar Library - runtime tools
-Requires: cds-crtools
 Requires: gwdatafind
 Requires: lib%{name} = %{version}-%{release}
 Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release}
@@ -150,7 +148,7 @@ This package provides the Octave bindings for LALPulsar.
 %setup -q -n %{name}-%{version}%{?nightly:-%{nightly}}
 
 %build
-%configure %{configure_opts} --disable-gcc-flags --enable-sistr --enable-swig PYTHON=%{__python3}
+%configure %{configure_opts} --disable-gcc-flags --enable-swig PYTHON=%{__python3}
 %{__make} %{?_smp_mflags} V=1
 
 %check