Accepting request 346133 from home:scorot:branches:science

- fix build against recent scalapack which includes blacs library

OBS-URL: https://build.opensuse.org/request/show/346133
OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=7

Makefile.par.inc

@@ -69,7 +69,7 @@ FL = mpif77
 AR = ar vr
 #RANLIB = ranlib
 RANLIB  = echo
-SCALAP  = -lscalapack -lmpiblacs -lmpiblacsCinit
+SCALAP  = -lscalapack
 #INCPAR = -I/usr/local/include
 #INCPAR = -I/usr/include/mpi
 # LIBPAR = $(SCALAP)  -L/usr/local/lib/ -llammpio -llamf77mpi -lmpi -llam -lutil -ldl -lpthread

Makefile.ptscotch.inc

@@ -69,7 +69,7 @@ FL = gfortran
 AR = ar vr
 #RANLIB = ranlib
 RANLIB  = echo
-SCALAP  = -lscalapack -lmpiblacs -lmpiblacsCinit
+SCALAP  = -lscalapack
 #INCPAR = -I/usr/local/include
 #INCPAR = -I/usr/include/mpi
 # LIBPAR = $(SCALAP)  -L/usr/local/lib/ -llammpio -llamf77mpi -lmpi -llam -lutil -ldl -lpthread

mumps.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 21 14:23:53 UTC 2015 - scorot@free.fr
+
+- fix build against recent scalapack which includes blacs library
+
 -------------------------------------------------------------------
 Wed May 22 20:20:13 UTC 2013 - scorot@free.fr
 

mumps.spec

@@ -39,14 +39,12 @@ Patch1:         mumps-4.9.2-debian-shared-pord.patch
 Patch2:         mumps-4.9.2-debian-tests-shlibs.patch
 Patch3:         mumps-4.9.2-debian-shared-mumps.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  blacs-openmpi-devel
 BuildRequires:  gcc-fortran
 BuildRequires:  libptscotch-openmpi-devel
 BuildRequires:  libscotch-devel
 BuildRequires:  openmpi-devel
 BuildRequires:  scalapack-openmpi-devel
 %if 0%{?sles_version}
-BuildRequires:  blacs-mvapich2-devel
 BuildRequires:  libptscotch-mvapich2-devel
 BuildRequires:  mvapich2-devel
 BuildRequires:  scalapack-mvapich2-devel
@@ -138,7 +136,6 @@ Scotch enabled.
 %package openmpi-devel
 Summary:        Files needed for developing mumps based applications
 Group:          Development/Libraries/Parallel
-Requires:       blacs-openmpi-devel
 Requires:       blas-devel
 Requires:       lapack-devel
 Requires:       mumps-devel = %{version}
@@ -201,7 +198,6 @@ Scotch enabled.
 %package mvapich2-devel
 Summary:        Files needed for developing mumps based applications
 Group:          Development/Libraries/Parallel
-Requires:       blacs-mvapich2-devel
 Requires:       blas-devel
 Requires:       lapack-devel
 Requires:       mumps-devel = %{version}