Accepting request 843942 from home:badshah400:branches:science

- Update URL.
- Specfile cleanups using spec-cleaner.
- Drop redundant build/runtime dependencies:
  * libframe-devel: superseded by framel-devel.
  * ldas-tools-framecpp-devel is identical to pkgconfig(framecppc).
- Implement tests as part of %check; additionally needs BuildRequires: python3-pytest.
- ExcludeArch 32-bit, as tests fail and upstream confirms that it is not supported (https://git.ligo.org/lscsoft/lalsuite/-/issues/371).

OBS-URL: https://build.opensuse.org/request/show/843942
OBS-URL: https://build.opensuse.org/package/show/science/lalframe?expand=0&rev=4

lalframe.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Sun Oct 25 18:32:25 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update URL.
+- Specfile cleanups using spec-cleaner.
+
+-------------------------------------------------------------------
+Fri Oct 23 10:42:49 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Drop redundant build/runtime dependencies:
+  * libframe-devel: superseded by framel-devel.
+  * ldas-tools-framecpp-devel is identical to
+    pkgconfig(framecppc).
+
+-------------------------------------------------------------------
+Sat Aug 15 17:53:49 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Implement tests as part of %check; additionally needs
+  BuildRequires: python3-pytest.
+- ExcludeArch 32-bit, as tests fail and upstream confirms that it
+  is not supported
+  (https://git.ligo.org/lscsoft/lalsuite/-/issues/371).
+
 -------------------------------------------------------------------
 Mon Jul  6 23:23:25 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
 

lalframe.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lalframe
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,30 +24,32 @@ Release:        0
 Summary:        LSC Algorithm Frame Library for gravitational wave data analysis
 License:        GPL-2.0-or-later
 Group:          Productivity/Scientific/Physics
-URL:            https://wiki.ligo.org/Computing/DASWG/LALSuite
+URL:            https://wiki.ligo.org/Computing/LALSuite
 Source:         http://software.ligo.org/lscsoft/source/lalsuite/lalframe-%{version}.tar.xz
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module lal >= 6.21.0}
 BuildRequires:  %{python_module numpy-devel}
 BuildRequires:  %{python_module numpy}
-%if 0%{?suse_version} < 1550
-BuildRequires:  python-xml
-%endif
 BuildRequires:  fdupes
-BuildRequires:  ldas-tools-framecpp-devel
+BuildRequires:  pkgconfig
-BuildRequires:  libframe-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  swig
-BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(framecppc)
 BuildRequires:  pkgconfig(framel)
 BuildRequires:  pkgconfig(lal) >= 6.21.0
+Requires:       python-lal
+Requires:       python-numpy
+ExcludeArch:    %{ix86}
+%if 0%{?suse_version} < 1550
+BuildRequires:  python-xml
+%endif
 %if %{with octave}
 BuildRequires:  octave-lal >= 6.21.0
 BuildRequires:  pkgconfig(octave)
 %endif
-Requires:       python-lal
+# SECTION For tests
-Requires:       python-numpy
+BuildRequires:  python3-pytest
+# /SECTION
 %python_subpackages
 
 %description
@@ -65,8 +67,8 @@ that use the LAL Frame library.
 Summary:        Development files for LAL Frame
 Group:          Development/Libraries/C and C++
 Requires:       %{shlib} = %{version}
-Requires:       ldas-tools-framecpp-devel
+Requires:       pkgconfig(framecppc)
-Requires:       libframe-devel
+Requires:       pkgconfig(framel)
 Requires:       pkgconfig(lal)
 
 %description -n %{name}-devel
@@ -89,12 +91,12 @@ This package provides the necessary files for using LAL Frame with octave.
 %{python_expand # Necessary to run %%configure with both py2 and py3
 export PYTHON=$python
 mkdir ../${PYTHON}_build
-cp -pr ./ ../${PYTHON}_build  
+cp -pr ./ ../${PYTHON}_build
 pushd ../${PYTHON}_build
 %configure \
   %{?with_octave:--enable-swig-octave} \
   %{!?with_octave:--disable-swig-octave}
-make %{?_smp_mflags}
+%make_build
 popd
 }
 
@@ -141,6 +143,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %python_expand %fdupes %{buildroot}%{$python_sitearch}/%{name}/
 
+%ifpython3
+%check
+%make_build check
+%endif
+
 %post -n %{shlib} -p /sbin/ldconfig
 %postun -n %{shlib} -p /sbin/ldconfig