From 9580e1b62aa55a84d793bd7c2465fd472648e852 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 1 Dec 2014 16:01:40 +1100 Subject: [PATCH] Correct the papi_disable macro for older pcp builds --- pcp.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pcp.spec b/pcp.spec index 0dcd69c..fe791af 100644 --- a/pcp.spec +++ b/pcp.spec @@ -12,10 +12,14 @@ Source1: pcp-webjs.src.tar.gz # There are no papi/libpfm devel packages for s390 nor for some rhels, disable %ifarch s390 s390x -%{!?disable_papi: %global disable_papi 1} -%{!?disable_perfevent: %global disable_perfevent 1} +%define disable_papi 1 +%define disable_perfevent 1 %else -%{!?disable_papi: %global disable_papi 0%{?rhel} < 6} +%if 0%{?rhel} == 0 || 0%{?rhel} > 5 +%define disable_papi 0 +%else +%define disable_papi 1 +%endif %if 0%{?fedora} >= 20 || 0%{?rhel} > 6 %define disable_perfevent 0 %else