[cp2k] compile against new blacs

Tom Callaway spot at fedoraproject.org
Mon May 12 18:40:32 UTC 2014


commit 0782a75c9d0a7f8d3fc62e61b0c0ed83a117090f
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon May 12 14:40:18 2014 -0400

    compile against new blacs

 cp2k.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/cp2k.spec b/cp2k.spec
index 61e9225..e90a6f3 100644
--- a/cp2k.spec
+++ b/cp2k.spec
@@ -3,7 +3,7 @@
 
 Name: cp2k
 Version: 2.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Engineering
 Summary: Ab Initio Molecular Dynamics
 License: GPLv2+
@@ -108,6 +108,11 @@ This package contains the documentation and the manual.
 rm -r tools/makedepf90
 chmod -x src/harris_{functional,{env,energy}_types}.F
 
+%if 0%{?fedora} >= 21
+sed -i 's|-lmpiblacsF77init||g' arch/Linux-x86-64-gfortran*
+sed -i 's|-lmpiblacsCinit||g' arch/Linux-x86-64-gfortran*
+%endif
+
 # Generate necessary symlinks
 TARGET=$(tools/get_arch_code)
 %ifnarch x86_64
@@ -204,6 +209,9 @@ popd
 %{_libdir}/mpich%{?_opt_cc_suffix}/bin/cp2k.psmp_mpich
 
 %changelog
+* Mon May 12 2014 Tom Callaway <spot at fedoraproject.org> - 2.5.1-2
+- compile against new blacs in rawhide
+
 * Fri Mar 14 2014 Dominik Mierzejewski <rpm at greysector.net> - 2.5.1-1
 - update to upstream 2.5.1 release
 - drop backported compilation fix


More information about the scm-commits mailing list