orion pushed to scorep (el6). "Fixup RHEL conditionals"

[notifications at fedoraproject.org]

>From f66ce920fd67e2054f5f6afd68c5c26e64b6c9f9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Mon, 15 Dec 2014 10:54:26 -0700
Subject: Fixup RHEL conditionals


diff --git a/scorep.spec b/scorep.spec
index 00fbcd8..bbc95ed 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -23,10 +23,6 @@ Requires:       papi
 
 %global with_mpich 1
 %global with_openmpi 1
-%if 0%{?rhel}
-# No mpich in EL
-%global with_mpich 0
-%endif
 %ifarch s390 s390x
 # No openmpi on s390(x)
 %global with_openmpi 0
@@ -129,7 +125,7 @@ for mpi in %{mpi_list}
 do
   mkdir $mpi
   cd $mpi
-%if 0%{?rhel}
+%if 0%{?el6}
   module load $mpi-%{_arch}
 %else
   module load mpi/$mpi-%{_arch}
@@ -157,7 +153,7 @@ chrpath -d %{buildroot}%{_libdir}/*.so.*
 
 for mpi in %{mpi_list}
 do
-%if 0%{?rhel}
+%if 0%{?el6}
   module load $mpi-%{_arch}
 %else
   module load mpi/$mpi-%{_arch}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/scorep.git/commit/?h=el6&id=f66ce920fd67e2054f5f6afd68c5c26e64b6c9f9