[pcp/el5] BuildRequires: systemtap-sdt-devel no longer conditional on !disable_python2

Dave Brolley brolley at fedoraproject.org
Tue Mar 3 01:14:45 UTC 2015


commit aaa5ccc033b6551c2635e52ff3199bebed7f334f
Author: Dave Brolley <brolley at redhat.com>
Date:   Mon Mar 2 20:14:57 2015 -0500

    BuildRequires: systemtap-sdt-devel no longer conditional on !disable_python2

 pcp.spec | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/pcp.spec b/pcp.spec
index 4341661..ff0372f 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -65,14 +65,6 @@ BuildRequires: rpm-devel
 BuildRequires: avahi-devel
 %if !%{disable_python2}
 BuildRequires: python-devel
-# systemtap dtrace utility requires python2, so only use it if we can
-%if 0%{?rhel} == 0 || 0%{?rhel} > 5
-BuildRequires: systemtap-sdt-devel
-%else
-%ifnarch ppc ppc64
-BuildRequires: systemtap-sdt-devel
-%endif
-%endif
 %endif
 %if !%{disable_python3}
 BuildRequires: python3-devel
@@ -92,6 +84,13 @@ BuildRequires: libmicrohttpd-devel
 %if !%{disable_cairo}
 BuildRequires: cairo-devel
 %endif
+%if 0%{?rhel} == 0 || 0%{?rhel} > 5
+BuildRequires: systemtap-sdt-devel
+%else
+%ifnarch ppc ppc64
+BuildRequires: systemtap-sdt-devel
+%endif
+%endif
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: initscripts man
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7


More information about the scm-commits mailing list