Merge branch 'master' into el5
This commit is contained in:
commit
9d5f333a4a
6
pcp.spec
6
pcp.spec
@ -16,7 +16,11 @@ Source1: pcp-webjs.src.tar.gz
|
|||||||
%{!?disable_perfevent: %global disable_perfevent 1}
|
%{!?disable_perfevent: %global disable_perfevent 1}
|
||||||
%else
|
%else
|
||||||
%{!?disable_papi: %global disable_papi 0%{?rhel} < 6}
|
%{!?disable_papi: %global disable_papi 0%{?rhel} < 6}
|
||||||
%{!?disable_perfevent: %global disable_perfevent 0%{?rhel} < 7}
|
%if 0%{?fedora} >= 20 || 0%{?rhel} > 6
|
||||||
|
%define disable_perfevent 0
|
||||||
|
%else
|
||||||
|
%define disable_perfevent 1
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define disable_microhttpd 0
|
%define disable_microhttpd 0
|
||||||
|
Loading…
Reference in New Issue
Block a user