rathann pushed to elpa (f22). "fix build on EPEL7 and re-enable openmpi tests (..more)"

[notifications at fedoraproject.org]

>From 7704412543e6d062db857e0194009ac4ec0dc14f Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date: Mon, 4 May 2015 11:28:31 +0200
Subject: fix build on EPEL7 and re-enable openmpi tests

- fix build on EPEL7 (missing _pkgdocdir macro and BR: rsh for openmpi)
- move examples to -devel subpackage
- print whole testsuite log in case of test failure
- re-enable openmpi tests on i686 and armv7hl

diff --git a/elpa.spec b/elpa.spec
index 2742331..98d718b 100644
--- a/elpa.spec
+++ b/elpa.spec
@@ -1,7 +1,9 @@
+%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}}
+
 Summary: High-performance library for parallel solution of eigenvalue problems
 Name: elpa
 Version: 2015.02.002
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://elpa.rzg.mpg.de/
 Source0: http://elpa.rzg.mpg.de/elpa-%{version}.tar.gz
 # fix pkgconfig file
@@ -89,6 +91,8 @@ This package contains the development files for ELPA (MPICH version).
 
 %package openmpi
 Summary: Fast library for parallel solution of eigenvalue problems (OpenMPI version)
+# required for running the testsuite
+BuildRequires: rsh
 BuildRequires: openmpi-devel
 BuildRequires: blacs-openmpi-devel
 BuildRequires: scalapack-openmpi-devel
@@ -196,23 +200,20 @@ done
 %check
 %{_mpich_load}
 pushd mpich
-make check V=1 || cat elpa1_test_real_c_version.sh.log
+make check V=1 || cat ./test-suite.log
 popd
 pushd _openmp/mpich
-make check V=1 || cat elpa1_test_real_c_version.sh.log
+make check V=1 || cat ./test-suite.log
 popd
 %{_mpich_unload}
 
 # only non-mt openmpi build can be tested, see bug #1105902
-# openmpi tests timeout on ARM and i686, see bug #1144408
-%ifnarch armv7hl i686
 %{_openmpi_load}
 pushd openmpi
-make check V=1 || cat elpa1_test_real_c_version.sh.log
+make check V=1 || cat ./test-suite.log
 popd
 %{_openmpi_unload}
 %endif
-%endif
 
 %post mpich -p /sbin/ldconfig
 
@@ -227,11 +228,11 @@ popd
 %license %{_pkgdocdir}/gpl.txt
 %license %{_pkgdocdir}/lgpl.txt
 %{_pkgdocdir}/README
-%{_pkgdocdir}/examples
 
 %files devel
 %{_includedir}/elpa-%{version}
 %{_includedir}/elpa_openmp-%{version}
+%{_pkgdocdir}/examples
 
 %files mpich
 %{_libdir}/mpich%{?_opt_cc_suffix}/bin/elpa2_print_kernels
@@ -262,6 +263,12 @@ popd
 %exclude %{_fmoddir}/openmpi%{?_cc_name_suffix}/*_openmp.mod
 
 %changelog
+* Mon May 04 2015 Dominik Mierzejewski <rpm at greysector.net> 2015.02.002-4
+- fix build on EPEL7 (missing _pkgdocdir macro and BR: rsh for openmpi)
+- move examples to -devel subpackage
+- print whole testsuite log in case of test failure
+- re-enable openmpi tests on i686 and armv7hl
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 2015.02.002-3
 - Rebuilt for GCC 5 C++11 ABI change
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/elpa.git/commit/?h=f22&id=7704412543e6d062db857e0194009ac4ec0dc14f