From 72c80ea2a8b575a591a4343561e70796f0235d04766afad332ac2c584352fd9c Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Mon, 26 Feb 2018 15:12:28 +0000
Subject: [PATCH] Accepting request 580273 from home:mslacken:hpc

- removed openmpi3 pattern and warning about explict library dep

OBS-URL: https://build.opensuse.org/request/show/580273
OBS-URL: https://build.opensuse.org/package/show/science:HPC/patterns-hpc?expand=0&rev=7
---
 devel-inc.txt          |  4 +---
 library-inc.txt        |  4 +---
 patterns-hpc-rpmlintrc |  1 +
 patterns-hpc.changes   |  5 +++++
 patterns-hpc.spec      | 10 +++++-----
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/devel-inc.txt b/devel-inc.txt
index 0fffe01..36b566a 100644
--- a/devel-inc.txt
+++ b/devel-inc.txt
@@ -16,10 +16,8 @@ Recommends:     libopenblas-pthreads-gnu-hpc-devel
 Requires:       mpich-gnu-hpc-devel
 Requires:       mpich-ofi-gnu-hpc-devel
 Requires:       mvapich2-gnu-hpc-devel
-Requires:       mvapich2-psm-gnu-hpc-devel
 Requires:       mvapich2-psm2-gnu-hpc-devel
-Requires:       openmpi1-gnu-hpc-devel
-Requires:       openmpi3-gnu-hpc-devel
+Requires:       openmpi2-gnu-hpc-devel
 Recommends:     libblacs2-gnu-mpich-hpc-devel
 Recommends:     libblacs2-gnu-mvapich2-hpc-devel
 Recommends:     libfftw3-gnu-mpich-hpc-devel
diff --git a/library-inc.txt b/library-inc.txt
index af27711..8ba1152 100644
--- a/library-inc.txt
+++ b/library-inc.txt
@@ -18,10 +18,8 @@ Recommends:     libopenblas-pthreads-gnu-hpc
 Requires:       mpich-gnu-hpc
 Requires:       mpich-ofi-gnu-hpc
 Requires:       mvapich2-gnu-hpc
-Requires:       mvapich2-psm-gnu-hpc
 Requires:       mvapich2-psm2-gnu-hpc
-Requires:       openmpi1-gnu-hpc
-Requires:       openmpi3-gnu-hpc
+Requires:       openmpi2-gnu-hpc
 # Now the mpi dependend recommends
 Recommends:     libblacs2-gnu-mpich-hpc
 Recommends:     libblacs2-gnu-mvapich2-hpc
diff --git a/patterns-hpc-rpmlintrc b/patterns-hpc-rpmlintrc
index 2e53483..e318542 100644
--- a/patterns-hpc-rpmlintrc
+++ b/patterns-hpc-rpmlintrc
@@ -1,4 +1,5 @@
 addFilter("W: no-binary");
 addFilter("W: unexpanded-macro");
 addFilter("W: devel-dependency");
+addFilter("W: explicit-lib-dependency");
 
diff --git a/patterns-hpc.changes b/patterns-hpc.changes
index 3469df7..7208086 100644
--- a/patterns-hpc.changes
+++ b/patterns-hpc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 26 14:14:46 UTC 2018 - cgoll@suse.com
+
+- removed openmpi3 pattern and warning about explict library dep
+
 -------------------------------------------------------------------
 Sat Feb 24 13:06:37 UTC 2018 - eich@suse.com
 
diff --git a/patterns-hpc.spec b/patterns-hpc.spec
index 552aebb..3c080ce 100644
--- a/patterns-hpc.spec
+++ b/patterns-hpc.spec
@@ -65,7 +65,7 @@ A compute node has a minmal software image and mainly runs simultion programs. S
 
 %files compute_node
 %dir %{_defaultdocdir}/patterns
-%{_defaultdocdir}/patterns/compute-node.txt
+%{_defaultdocdir}/patterns/patterns-hpc-compute-node.txt
 
 ################################################################################
 
@@ -88,7 +88,7 @@ This package provides all the modularized libraries so that they can be used in
 
 %files libraries
 %dir %{_defaultdocdir}/patterns
-%{_defaultdocdir}/patterns/hpc-libraries.txt
+%{_defaultdocdir}/patterns/patterns-hpc-libraries.txt
 
 ################################################################################
 %package development_node
@@ -101,6 +101,7 @@ Provides:       pattern-icon() = pattern-basis-devel
 Provides:       pattern-order() = 2040
 Provides:       pattern-visible()
 Requires:       pattern() = hpc_compute_node
+Requires:       pattern() = hpc_libraries
 %if 0%{?is_opensuse}
 Requires:       pattern() = devel_C_C++
 Requires:       pattern() = devel_basic
@@ -116,7 +117,6 @@ Requires:       automake
 Requires:       libtool
 Requires:       glibc-devel
 Requires:       libstdc++-devel
-Requires:       gcc-info
 Requires:       glibc-info
 Requires:	pkgconfig
 Requires:       binutils
@@ -136,7 +136,7 @@ This package provides all the relevant packages for developing HPC applications.
 
 %files development_node
 %dir %{_defaultdocdir}/patterns
-%{_defaultdocdir}/patterns/hpc-development-node.txt
+%{_defaultdocdir}/patterns/patterns-hpc-development-node.txt
 
 %prep
 
@@ -144,7 +144,7 @@ This package provides all the relevant packages for developing HPC applications.
 
 %install
 mkdir -p "%{buildroot}%{_defaultdocdir}/patterns"
-for pack in compute-node hpc-libraries hpc-development-node; do
+for pack in patterns-hpc-compute-node patterns-hpc-libraries patterns-hpc-development-node; do
     echo "This file marks the pattern $pack in version %{version} to be installed." \
 		>"%{buildroot}%{_defaultdocdir}/patterns/${pack}.txt"
 done