From 2b249779343087680b3ee47af864739199c16000 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sep 30 2018 16:38:29 +0000 Subject: Release 2.4.1 --- diff --git a/.gitignore b/.gitignore index 8106d93..4c7f739 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /openmeeg-ee565c437650f11786f336a1f620474d31e64018.zip /openmeeg-2.4-rc1.tar.gz /openmeeg-2.4-rc4.tar.gz +/openmeeg-2.4.1.tar.gz diff --git a/openmeeg.spec b/openmeeg.spec index 670c5f1..d8aec40 100644 --- a/openmeeg.spec +++ b/openmeeg.spec @@ -3,19 +3,23 @@ %bcond_without hdf5 %bcond_without matio %bcond_with cgal - %bcond_without doc %bcond_without check -%global relsuf rc4 +%bcond_with debug + +## https://github.com/openmeeg/openmeeg/issues/346 +ExcludeArch: s390x + +#%%global relsuf rc4 Name: openmeeg -Version: 2.4 -Release: 0.5.%{relsuf}%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Summary: Low-frequency bio-electromagnetism solving forward problems in the field of EEG and MEG License: CeCILL-B URL: http://openmeeg.github.io/ -Source0: https://github.com/openmeeg/openmeeg/archive/%{version}-%{relsuf}.tar.gz#/%{name}-%{version}-%{relsuf}.tar.gz +Source0: https://github.com/openmeeg/openmeeg/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # Do not require lapacke library Patch0: openmeeg-openblas_libraries.patch @@ -23,14 +27,7 @@ Patch0: openmeeg-openblas_libraries.patch # Set private directory for Python files Patch1: openmeeg-python_install_destination.patch -%if 0%{?rhel} -BuildRequires: cmake3, epel-rpm-macros -%global ctest3 ctest3 -%else -BuildRequires: cmake -%global cmake3 %cmake -%global ctest3 ctest -%endif +BuildRequires: cmake3 BuildRequires: gcc-c++, git, chrpath BuildRequires: gnuplot, wget, graphviz BuildRequires: expat-devel @@ -150,11 +147,10 @@ BuildArch: noarch %endif %prep -%autosetup -n %{name}-%{version}-%{relsuf} -p1 +%autosetup -n %{name}-%{version} -p1 %build mkdir -p build && pushd build -export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake3 %{openmeeg_cmake_options} .. # If built including the documentation, Make's parallel jobs are damaging @@ -171,7 +167,11 @@ make -j1 VERBOSE=1 %check pushd build export LD_LIBRARY_PATH=%{buildroot}%{_libdir}/%{name}:%{_libdir} -%ctest3 --force-new-ctest-process --parallel %{?_smp_mflags} +%if %{with debug} +ctest3 -VV --force-new-ctest-process -j1 --output-on-failure --debug +%else +ctest3 --force-new-ctest-process --parallel %{?_smp_mflags} +%endif %endif %ldconfig_scriptlets @@ -204,6 +204,10 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}/%{name}:%{_libdir} %endif %changelog +* Sun Sep 23 2018 Antonio Trande - 2.4.1-1 +- Release 2.4.1 +- Exclude s390x build + * Sat Sep 01 2018 Antonio Trande - 2.4-0.5.rc4 - Switch to python3 diff --git a/sources b/sources index a5f3ec1..02e4305 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmeeg-2.4-rc4.tar.gz) = 010d232b8b7558b601ba0fd3cb11602a10df7a65cccfb14f317a879c726e8be17a4b346f0a8dd6ca291929a1c5c9243eeec15f609339b1d3ffabc419d78b092d +SHA512 (openmeeg-2.4.1.tar.gz) = 9d2e44ab745f432c716bbaa8d7615bfe544041c67ebe4039652dfce75a92039bd40f57feb5f94d54ca266b8349b7ee701d2584451a2e768d5c2e441aa23df793