[elpa] update to 2015.02.002 release (ABI change)
Dominik Mierzejewski
rathann at fedoraproject.org
Fri Mar 20 09:48:11 UTC 2015
commit 6a5b59500f5805899b82c32f3d8eef6ce081580e
Author: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date: Fri Mar 20 10:48:01 2015 +0100
update to 2015.02.002 release (ABI change)
- drop libtool bug workaround
- make builds more verbose
- take advantage of upstream build system improvements
- ship C headers in -devel subpackage
.gitignore | 1 +
elpa-atlas.patch | 14 ++---
elpa-rpm.patch | 137 +++++++++++++++++-----------------------
elpa-scalapack.patch | 12 ----
elpa.spec | 172 +++++++++++++++++++++++++--------------------------
sources | 2 +-
6 files changed, 153 insertions(+), 185 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e32e815..c5ffd7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/ELPA_2013.11.008_20140321.tar.gz
+/elpa-2015.02.002.tar.gz
diff --git a/elpa-atlas.patch b/elpa-atlas.patch
index d37b8bd..c089eba 100644
--- a/elpa-atlas.patch
+++ b/elpa-atlas.patch
@@ -1,12 +1,12 @@
-diff -up mpich/configure.ac.blacs mpich/configure.ac
---- mpich/configure.ac.blacs 2014-03-21 12:10:21.000000001 +0100
-+++ mpich/configure.ac 2014-06-29 22:47:36.214804126 +0200
-@@ -274,7 +274,7 @@ if test "x${can_link_with_mkl}" = "xyes"
+diff -up mpich/configure.ac.atlas mpich/configure.ac
+--- mpich/configure.ac.atlas 2015-03-19 12:45:07.946282074 +0100
++++ mpich/configure.ac 2015-03-19 12:45:07.955282120 +0100
+@@ -335,7 +335,7 @@ if test x"${have_mkl}" = x"yes" ; then
else
dnl first check blas
-- AC_SEARCH_LIBS([dgemm],[blas],[can_link_with_blas=yes],[can_link_with_blas=no])
-+ AC_SEARCH_LIBS([dgemm],[satlas blas],[can_link_with_blas=yes],[can_link_with_blas=no])
+- AC_SEARCH_LIBS([dgemm],[blas],[have_blas=yes],[have_blas=no])
++ AC_SEARCH_LIBS([dgemm],[satlas blas],[have_blas=yes],[have_blas=no])
AC_MSG_CHECKING([whether we can link a program with a blas lib])
- AC_MSG_RESULT([${can_link_with_blas}])
+ AC_MSG_RESULT([${have_blas}])
diff --git a/elpa-rpm.patch b/elpa-rpm.patch
index 7be357d..8eaeae3 100644
--- a/elpa-rpm.patch
+++ b/elpa-rpm.patch
@@ -1,92 +1,71 @@
-diff -up mpich/configure.ac.r mpich/configure.ac
---- mpich/configure.ac.r 2014-06-26 12:57:49.488978955 +0200
-+++ mpich/configure.ac 2014-06-26 12:57:49.489978947 +0200
-@@ -374,6 +374,7 @@ mkdir modules
- AC_CONFIG_FILES([
- Makefile
- elpa.pc:elpa.pc.in
-+ elpa_mt.pc:elpa_mt.pc.in
- ])
- AC_OUTPUT
- grep "^#define" config.h > config-f90.h
-diff -up mpich/elpa_mt.pc.in.r mpich/elpa_mt.pc.in
---- mpich/elpa_mt.pc.in.r 2014-06-26 12:57:49.489978947 +0200
-+++ mpich/elpa_mt.pc.in 2014-06-26 12:57:49.489978947 +0200
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems.
-+Version: @PACKAGE_VERSION@
-+URL: @PACKAGE_URL@
-+Libs: -L${libdir} -lelpa_mt
-+fcflags= -I${libdir}/gfortran/modules
diff -up mpich/elpa.pc.in.r mpich/elpa.pc.in
---- mpich/elpa.pc.in.r 2013-10-28 15:48:06.000000001 +0100
-+++ mpich/elpa.pc.in 2014-06-26 12:57:49.489978947 +0200
-@@ -7,6 +7,5 @@ Name: @PACKAGE_NAME@
- Description: ELPA is a Fortran-based high-performance computational library for the (massively) parallel solution of symmetric or Hermitian, standard or generalized eigenvalue problems.
- Version: @PACKAGE_VERSION@
+--- mpich/elpa.pc.in.r 2015-03-16 11:39:51.000000000 +0100
++++ mpich/elpa.pc.in 2015-03-19 12:42:53.997589760 +0100
+@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
URL: @PACKAGE_URL@
--Libs: -L${libdir} -lelpa- at ELPA_LIB_VERSION@
--Cflags: -I${includedir}/elpa- at ELPA_LIB_VERSION@
--fcflags= -I${includedir}/elpa- at ELPA_LIB_VERSION@/modules
-+Libs: -L${libdir} -lelpa
-+fcflags= -I${libdir}/gfortran/modules
+ Libs: -L${libdir} -lelpa at SUFFIX@ @LIBS@ @OPENMP_FCFLAGS@
+ Cflags: -I${includedir}/elpa at SUFFIX@- at PACKAGE_VERSION@ @OPENMP_CFLAGS@
+-fcflags= -I${includedir}/elpa at SUFFIX@- at PACKAGE_VERSION@/modules @OPENMP_FCFLAGS@
++fcflags= -I${libdir}/gfortran/modules @OPENMP_FCFLAGS@
diff -up mpich/Makefile.am.r mpich/Makefile.am
---- mpich/Makefile.am.r 2014-02-27 14:47:20.000000001 +0100
-+++ mpich/Makefile.am 2014-06-26 13:05:18.698163114 +0200
-@@ -19,8 +19,14 @@ endif
+--- mpich/Makefile.am.r 2015-03-19 12:42:54.002589786 +0100
++++ mpich/Makefile.am 2015-03-19 12:44:26.025065404 +0100
+@@ -204,47 +204,47 @@ check_SCRIPTS = \
- if WITH_OPENMP
- libelpa_mt_la_SOURCES = src/elpa1.F90 src/elpa2.F90
-+libelpa_mt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(FC) $(AM_FCLAGS) \
-+ $(FCFLAGS) $(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@
- else
- libelpa_la_SOURCES = src/elpa1.F90 src/elpa2.F90
-+libelpa_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(FC) $(AM_FCLAGS) \
-+ $(FCFLAGS) $(libelpa_la_LDFLAGS) $(LDFLAGS) -o $@
- endif
+ TESTS = $(check_SCRIPTS)
+ elpa1_test_real.sh:
+- echo 'mpiexec -n 2 ./elpa1_test_real at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real.sh
+ chmod +x elpa1_test_real.sh
- if WITH_GENERIC_SIMPLE
-@@ -164,7 +170,11 @@ files_DATA = \
+ elpa1_test_real_with_c.sh:
+- echo 'mpiexec -n 2 ./elpa1_test_real_with_c at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_with_c.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_with_c at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_with_c.sh
+ chmod +x elpa1_test_real_with_c.sh
- # pkg-config stuff
- pkgconfigdir = $(libdir)/pkgconfig
-+if WITH_OPENMP
-+pkgconfig_DATA = elpa_mt.pc
-+else
- pkgconfig_DATA = elpa.pc
-+endif
+ elpa1_test_real_c_version.sh:
+- echo 'mpiexec -n 2 ./elpa1_test_real_c_version at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_c_version.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_c_version at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_c_version.sh
+ chmod +x elpa1_test_real_c_version.sh
- # test programs
- if WITH_OPENMP
-@@ -193,19 +203,19 @@ check_SCRIPTS = test_real.sh test_real2.
- TESTS = $(check_SCRIPTS)
+ elpa2_test_real.sh:
+- echo 'mpiexec -n 2 ./elpa2_test_real at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real.sh
+ chmod +x elpa2_test_real.sh
+
+ elpa2_test_real_default_kernel.sh:
+- echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel.sh
+ chmod +x elpa2_test_real_default_kernel.sh
+
+ elpa2_test_real_default_kernel_qr_decomposition.sh:
+- echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition.sh
+ chmod +x elpa2_test_real_default_kernel_qr_decomposition.sh
- test_real.sh:
-- echo "mpiexec -n 2 ./test_real > /dev/null 2>&1" > test_real.sh
-+ echo "mpiexec -n `getconf _NPROCESSORS_ONLN` ./test_real > /dev/null 2>&1" > test_real.sh
- chmod +x test_real.sh
+ elpa2_test_real_choose_kernel_with_api.sh:
+- echo 'mpiexec -n 2 ./elpa2_test_real_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api.sh
+ chmod +x elpa2_test_real_choose_kernel_with_api.sh
- test_real2.sh:
-- echo "mpiexec -n 2 ./test_real2 > /dev/null 2>&1" > test_real2.sh
-+ echo "mpiexec -n `getconf _NPROCESSORS_ONLN` ./test_real2 > /dev/null 2>&1" > test_real2.sh
- chmod +x test_real2.sh
+ elpa1_test_complex.sh:
+- echo 'mpiexec -n 2 ./elpa1_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex.sh
+ chmod +x elpa1_test_complex.sh
- test_complex.sh:
-- echo "mpiexec -n 2 ./test_complex > /dev/null 2>&1" > test_complex.sh
-+ echo "mpiexec -n `getconf _NPROCESSORS_ONLN` ./test_complex > /dev/null 2>&1" > test_complex.sh
- chmod +x test_complex.sh
+ elpa2_test_complex.sh:
+- echo 'mpiexec -n 2 ./elpa2_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex.sh
+ chmod +x elpa2_test_complex.sh
- test_complex2.sh:
-- echo "mpiexec -n 2 ./test_complex2 > /dev/null 2>&1" > test_complex2.sh
-+ echo "mpiexec -n `getconf _NPROCESSORS_ONLN` ./test_complex2 > /dev/null 2>&1" > test_complex2.sh
- chmod +x test_complex2.sh
+ elpa2_test_complex_default_kernel.sh:
+- echo 'mpiexec -n 2 ./elpa2_test_complex_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel.sh
+ chmod +x elpa2_test_complex_default_kernel.sh
+ elpa2_test_complex_choose_kernel_with_api.sh:
+- echo 'mpiexec -n 2 ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api.sh
+ chmod +x elpa2_test_complex_choose_kernel_with_api.sh
+ elpa2_utilities.i: $(top_srcdir)/src/elpa2_utilities.F90
diff --git a/elpa.spec b/elpa.spec
index ba899a2..a855677 100644
--- a/elpa.spec
+++ b/elpa.spec
@@ -1,16 +1,10 @@
-%global minor_ver 008
-%global snap 20140321
-
Summary: High-performance library for parallel solution of eigenvalue problems
Name: elpa
-Version: 2013.11
-Release: 6.%{minor_ver}%{?dist}
+Version: 2015.02.002
+Release: 1%{?dist}
URL: http://elpa.rzg.mpg.de/
-# http://elpa.rzg.mpg.de/elpa-tar-archive/elpa-2013-11.006/at_download/file
-Source0: ELPA_%{version}.%{minor_ver}_%{snap}.tar.gz
-# fix scalapack detection on F21+
-Patch0: elpa-scalapack.patch
-# fix pkgconfig files and linking against mpi libraries
+Source0: http://elpa.rzg.mpg.de/elpa-%{version}.tar.gz
+# fix pkgconfig file and use all CPUs for testsuite
Patch1: elpa-rpm.patch
# build against atlas instead of reference blas
Patch2: elpa-atlas.patch
@@ -47,6 +41,18 @@ eigenvalue problems.
This package contains common files for ELPA.
+%package devel
+Summary: C header files for ELPA
+BuildArch: noarch
+Requires: %{name}-mpi-devel = %{version}-%{release}
+
+%description devel
+ELPA is a Fortran-based high-performance computational library for the
+(massively) parallel solution of symmetric or Hermitian, standard or generalized
+eigenvalue problems.
+
+This package contains the C header files for ELPA.
+
%package mpich
Summary: Fast library for parallel solution of eigenvalue problems (MPICH version)
BuildRequires: mpich-devel
@@ -66,7 +72,9 @@ This package contains ELPA built against MPICH.
%package mpich-devel
Summary: Development files for ELPA (MPICH version)
Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
-Requires: gcc-gfortran%{_isa}
+Requires: gcc-gfortran%{?_isa}
+Requires: %{name}-devel = %{version}-%{release}
+Provides: %{name}-mpi-devel = %{version}-%{release}
%description mpich-devel
ELPA is a Fortran-based high-performance computational library for the
@@ -94,7 +102,9 @@ This package contains ELPA built against OpenMPI.
%package openmpi-devel
Summary: Development files for ELPA (OpenMPI version)
Requires: %{name}-openmpi%{?_isa} = %{version}-%{release}
-Requires: gcc-gfortran%{_isa}
+Requires: gcc-gfortran%{?_isa}
+Requires: %{name}-devel = %{version}-%{release}
+Provides: %{name}-mpi-devel = %{version}-%{release}
%description openmpi-devel
ELPA is a Fortran-based high-performance computational library for the
@@ -103,121 +113,97 @@ eigenvalue problems.
This package contains the development files for ELPA (OpenMPI version).
-%global configure_in \\\
-%configure \\\
- --disable-silent-rules \\\
- --disable-static \\\
-%ifarch x86_64 \
- --with-sse-assembler \\\
-%else \
- --with-generic \\\
-%endif \
-
%prep
%setup -q -c -T -a 0
-mv ELPA_%{version} mpich
+mv elpa-%{version} mpich
pushd mpich
-%patch0 -p1 -b .scalapack
%patch1 -p1 -b .r
%patch2 -p1 -b .atlas
autoreconf -vifs
popd
cp -pr mpich openmpi
-mkdir _mt
-cp -pr mpich openmpi _mt/
+mkdir _openmp
+cp -pr mpich openmpi _openmp/
%build
export FCFLAGS=-ffree-line-length-none
%{_mpich_load}
-export LDFLAGS="-L%{_libdir}/atlas"
-export LDFLAGS="$LDFLAGS -L$MPI_LIB"
+export LDFLAGS="-L%{_libdir}/atlas -L$MPI_LIB"
pushd mpich
-%configure_in \
+%configure --disable-silent-rules --disable-static \
--libdir=%{_libdir}/mpich%{?_opt_cc_suffix}/lib
-# work around libtool bug
-sed -i -e 's/-l -l //' libtool
-make
-# %{?_smp_mflags}
+make %{?_smp_mflags} V=1
popd
-pushd _mt/mpich
-%configure_in \
+pushd _openmp/mpich
+%configure --disable-silent-rules --disable-static \
--with-openmp \
--libdir=%{_libdir}/mpich%{?_opt_cc_suffix}/lib
-# work around libtool bug
-sed -i -e 's/-l -l //' libtool
-make
-# %{?_smp_mflags}
+make %{?_smp_mflags} V=1
popd
-unset LDFLAGS
%{_mpich_unload}
%{_openmpi_load}
-export LDFLAGS="-L%{_libdir}/atlas"
-export LDFLAGS="$LDFLAGS -L$MPI_LIB"
+export LDFLAGS="-L%{_libdir}/atlas -L$MPI_LIB"
pushd openmpi
-%configure_in \
+%configure --disable-silent-rules --disable-static \
--libdir=%{_libdir}/openmpi%{?_opt_cc_suffix}/lib
-# work around libtool bug
-sed -i -e 's/-l -l //' libtool
-make
-# %{?_smp_mflags}
+make %{?_smp_mflags} V=1
popd
-pushd _mt/openmpi
-%configure_in \
+pushd _openmp/openmpi
+%configure --disable-silent-rules --disable-static \
--with-openmp \
--libdir=%{_libdir}/openmpi%{?_opt_cc_suffix}/lib
-# work around libtool bug
-sed -i -e 's/-l -l //' libtool
-make
-# %{?_smp_mflags}
+make %{?_smp_mflags} V=1
popd
-unset LDFLAGS
%{_openmpi_unload}
%install
-for s in '' _mt ; do
+for s in '' _openmp ; do
for mpi in mpich openmpi ; do
pushd ${s:-.}/${mpi}
make DESTDIR=%{buildroot} install
+ rm %{buildroot}%{_bindir}/elpa?_test_*
+ mkdir -p %{buildroot}%{_libdir}/${mpi}%{?_opt_cc_suffix}/bin
+ mv %{buildroot}%{_bindir}/elpa2_print_kernels${s} %{buildroot}%{_libdir}/${mpi}%{?_opt_cc_suffix}/bin/
%ifnarch aarch64 ppc64le
- execstack -c .libs/libelpa${s}.so.0.* %{buildroot}%{_libdir}/${mpi}%{?_opt_cc_suffix}/lib/libelpa${s}.so.0.*
+ execstack -c .libs/libelpa${s}.so.?.* %{buildroot}%{_libdir}/${mpi}%{?_opt_cc_suffix}/lib/libelpa${s}.so.?.*
%endif
mkdir -p %{buildroot}%{_fmoddir}/${mpi}%{?_opt_cc_suffix}
- mv %{buildroot}%{_includedir}/elpa/modules/elpa1.mod %{buildroot}%{_fmoddir}/${mpi}%{?_cc_name_suffix}/elpa1${s}.mod
- mv %{buildroot}%{_includedir}/elpa/modules/elpa2.mod %{buildroot}%{_fmoddir}/${mpi}%{?_cc_name_suffix}/elpa2${s}.mod
+ for f in $(ls -1 %{buildroot}%{_includedir}/elpa${s}-%{version}/modules/*.mod) ; do
+ m=$(basename ${f} .mod)
+ mv %{buildroot}%{_includedir}/elpa${s}-%{version}/modules/${m}.mod %{buildroot}%{_fmoddir}/${mpi}%{?_cc_name_suffix}/${m}${s}.mod
+ done
rm %{buildroot}%{_libdir}/${mpi}%{?_opt_cc_suffix}/lib/libelpa${s}.la
# fix-up fcflags include path per mpi implementation
- sed -i -e "/^fcflags.*modules/s,$,/${mpi}," %{buildroot}%{_libdir}/${mpi}/lib/pkgconfig/elpa${s}.pc
+ sed -i -e "/^fcflags.*modules/s,/modules,/modules/${mpi}," %{buildroot}%{_libdir}/${mpi}/lib/pkgconfig/elpa${s}-%{version}.pc
popd
done
done
-rm %{buildroot}%{_datadir}/*.F90
-rm %{buildroot}%{_bindir}/test*
%if 1
%check
%{_mpich_load}
pushd mpich
-make check
+make check V=1
popd
-pushd _mt/mpich
-make check
+pushd _openmp/mpich
+make check V=1
popd
%{_mpich_unload}
# only non-mt openmpi build can be tested, see bug #1105902
-# openmpi tests timeout on ARM, see bug #1144408
-%ifnarch armv7hl
+# openmpi tests timeout on ARM and i686, see bug #1144408
+%ifnarch armv7hl i686
%{_openmpi_load}
pushd openmpi
-make check
+make check V=1
popd
%{_openmpi_unload}
%endif
@@ -232,38 +218,52 @@ popd
%postun openmpi -p /sbin/ldconfig
%files common
-%doc mpich/COPYING/* mpich/README
+%license %{_pkgdocdir}/COPYING
+%license %{_pkgdocdir}/gpl.txt
+%license %{_pkgdocdir}/lgpl.txt
+%{_pkgdocdir}/README
+%{_pkgdocdir}/examples
+
+%files devel
+%{_includedir}/elpa-%{version}
+%{_includedir}/elpa_openmp-%{version}
%files mpich
-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa.so.0*
-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa_mt.so.0*
+%{_libdir}/mpich%{?_opt_cc_suffix}/bin/elpa2_print_kernels
+%{_libdir}/mpich%{?_opt_cc_suffix}/bin/elpa2_print_kernels_openmp
+%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa.so.3*
+%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa_openmp.so.3*
%files mpich-devel
%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa.so
-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa_mt.so
-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/pkgconfig/elpa.pc
-%{_libdir}/mpich%{?_opt_cc_suffix}/lib/pkgconfig/elpa_mt.pc
-%{_fmoddir}/mpich%{?_cc_name_suffix}/elpa1.mod
-%{_fmoddir}/mpich%{?_cc_name_suffix}/elpa2.mod
-%{_fmoddir}/mpich%{?_cc_name_suffix}/elpa1_mt.mod
-%{_fmoddir}/mpich%{?_cc_name_suffix}/elpa2_mt.mod
+%{_libdir}/mpich%{?_opt_cc_suffix}/lib/libelpa_openmp.so
+%{_libdir}/mpich%{?_opt_cc_suffix}/lib/pkgconfig/elpa-%{version}.pc
+%{_libdir}/mpich%{?_opt_cc_suffix}/lib/pkgconfig/elpa_openmp-%{version}.pc
+%{_fmoddir}/mpich%{?_cc_name_suffix}/*.mod
# only non-mt openmpi build, see bug #1105902
%files openmpi
-%{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa.so.0*
-%exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa_mt.so.0*
+%{_libdir}/openmpi%{?_opt_cc_suffix}/bin/elpa2_print_kernels
+%exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/bin/elpa2_print_kernels_openmp
+%{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa.so.3*
+%exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa_openmp.so.3*
%files openmpi-devel
%{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa.so
-%exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa_mt.so
-%{_libdir}/openmpi%{?_opt_cc_suffix}/lib/pkgconfig/elpa.pc
-%exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/pkgconfig/elpa_mt.pc
-%{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa1.mod
-%{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa2.mod
-%exclude %{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa1_mt.mod
-%exclude %{_fmoddir}/openmpi%{?_cc_name_suffix}/elpa2_mt.mod
+%exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/libelpa_openmp.so
+%{_libdir}/openmpi%{?_opt_cc_suffix}/lib/pkgconfig/elpa-%{version}.pc
+%exclude %{_libdir}/openmpi%{?_opt_cc_suffix}/lib/pkgconfig/elpa_openmp-%{version}.pc
+%{_fmoddir}/openmpi%{?_cc_name_suffix}/*.mod
+%exclude %{_fmoddir}/openmpi%{?_cc_name_suffix}/*_openmp.mod
%changelog
+* Thu Mar 19 2015 Dominik Mierzejewski <rpm at greysector.net> 2015.02.002-1
+- update to 2015.02.002 release (ABI change)
+- drop libtool bug workaround
+- make builds more verbose
+- take advantage of upstream build system improvements
+- ship C headers in -devel subpackage
+
* Mon Mar 16 2015 Thomas Spura <tomspur at fedoraproject.org> - 2013.11-6.008
- Rebuild for changed mpich libraries
diff --git a/sources b/sources
index 80cd3a3..4e53326 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3252a6b370239a27afec8c6c47360442 ELPA_2013.11.008_20140321.tar.gz
+794bd60160e133cc93cfb978c3cce34b elpa-2015.02.002.tar.gz
More information about the scm-commits
mailing list