Automated weekly pcp rawhide release: 0.21.g6bad98e
This commit is contained in:
Lukas Berk
parent
9580e1b62a
commit
99f1eac559
1
.gitignore
vendored
1
.gitignore
vendored
@ -35,3 +35,4 @@ pcp-3.3.3-1.src.tar.gz
|
||||
/pcp-3.9.10.src.tar.gz
|
||||
/pcp-3.10.0.src.tar.gz
|
||||
/pcp-3.10.1.src.tar.gz
|
||||
/pcp-3.10.2-0.21.g6bad98e.tar.gz
|
||||
|
||||
69
pcp.spec
69
pcp.spec
@ -1,14 +1,14 @@
|
||||
Summary: System-level performance monitoring and performance management
|
||||
Name: pcp
|
||||
Version: 3.10.1
|
||||
Version: 3.10.2
|
||||
%define buildversion 1
|
||||
|
||||
Release: %{buildversion}%{?dist}
|
||||
Release: 0.21.g6bad98e%{?dist}
|
||||
License: GPLv2+ and LGPLv2.1+ and CC-BY
|
||||
URL: http://www.pcp.io
|
||||
Group: Applications/System
|
||||
Source0: %{name}-%{version}.src.tar.gz
|
||||
Source1: pcp-webjs.src.tar.gz
|
||||
Source0: %{name}-%{version}-0.21.g6bad98e.tar.gz
|
||||
Source1: ftp://oss.sgi.com/projects/pcp/download/pcp-webjs.src.tar.gz
|
||||
|
||||
# There are no papi/libpfm devel packages for s390 nor for some rhels, disable
|
||||
%ifarch s390 s390x
|
||||
@ -27,13 +27,31 @@ Source1: pcp-webjs.src.tar.gz
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1169226
|
||||
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
|
||||
%define disable_microhttpd 0
|
||||
%else
|
||||
%define disable_microhttpd 1
|
||||
%endif
|
||||
# Cairo headers on el5 incompatible with graphite code
|
||||
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
|
||||
%define disable_cairo 0
|
||||
%else
|
||||
%define disable_cairo 1
|
||||
%endif
|
||||
# Python development environment before el6 is pre-2.6 (too old)
|
||||
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
|
||||
%define disable_python2 0
|
||||
%else
|
||||
%define disable_python2 1
|
||||
%endif
|
||||
# No python3 development environment before el7
|
||||
%if 0%{?rhel} == 0 || 0%{?rhel} > 6
|
||||
%define disable_python3 0
|
||||
%else
|
||||
%define disable_python3 1
|
||||
%endif
|
||||
# Qt development and runtime environment missing components before el6
|
||||
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
|
||||
%define disable_qt 0
|
||||
%else
|
||||
@ -45,7 +63,9 @@ BuildRequires: procps autoconf bison flex
|
||||
BuildRequires: nss-devel
|
||||
BuildRequires: rpm-devel
|
||||
BuildRequires: avahi-devel
|
||||
%if !%{disable_python2}
|
||||
BuildRequires: python-devel
|
||||
%endif
|
||||
%if !%{disable_python3}
|
||||
BuildRequires: python3-devel
|
||||
%endif
|
||||
@ -120,14 +140,12 @@ Obsoletes: pcp-pmda-nvidia
|
||||
%ifarch s390 s390x
|
||||
%define disable_infiniband 1
|
||||
%else
|
||||
|
||||
# we never want Infiniband on RHEL5 or earlier
|
||||
%if 0%{?rhel} != 0 && 0%{?rhel} < 6
|
||||
%define disable_infiniband 1
|
||||
%else
|
||||
%define disable_infiniband 0
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%if %{disable_infiniband}
|
||||
@ -142,9 +160,6 @@ Obsoletes: pcp-pmda-nvidia
|
||||
%define _with_perfevent --with-perfevent=yes
|
||||
%endif
|
||||
|
||||
%if %{disable_qt}
|
||||
%define _with_ib --with-qt=no
|
||||
%endif
|
||||
|
||||
%description
|
||||
Performance Co-Pilot (PCP) provides a framework and services to support
|
||||
@ -452,6 +467,7 @@ collecting Infiniband statistics. By default, it monitors the local HCAs
|
||||
but can also be configured to monitor remote GUIDs such as IB switches.
|
||||
%endif
|
||||
|
||||
%if !%{disable_python2}
|
||||
#
|
||||
# python-pcp. This is the PCP library bindings for python.
|
||||
#
|
||||
@ -466,6 +482,7 @@ Requires: pcp-libs = %{version}-%{release}
|
||||
This python PCP module contains the language bindings for
|
||||
Performance Metric API (PMAPI) monitor tools and Performance
|
||||
Metric Domain Agent (PMDA) collector tools written in Python.
|
||||
%endif
|
||||
|
||||
%if !%{disable_python3}
|
||||
#
|
||||
@ -533,7 +550,7 @@ PCP utilities and daemons, and the PCP graphical tools.
|
||||
rm -Rf $RPM_BUILD_ROOT
|
||||
|
||||
%build
|
||||
%configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_perfevent} %{?_with_qt}
|
||||
%configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_perfevent}
|
||||
make default_pcp
|
||||
|
||||
%install
|
||||
@ -574,7 +591,11 @@ rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/infiniband
|
||||
%if %{disable_qt}
|
||||
rm -fr $RPM_BUILD_ROOT/%{_pixmapdir}
|
||||
rm -fr $RPM_BUILD_ROOT/%{_confdir}/pmsnap
|
||||
rm -f `find $RPM_BUILD_ROOT/%{_mandir}/man1 | egrep "$PCP_GUI"`
|
||||
rm -fr $RPM_BUILD_ROOT/%{_localstatedir}/lib/pcp/config/pmsnap
|
||||
rm -fr $RPM_BUILD_ROOT/%{_localstatedir}/lib/pcp/config/pmchart
|
||||
rm -f $RPM_BUILD_ROOT/%{_localstatedir}/lib/pcp/config/pmafm/pcp-gui
|
||||
rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop
|
||||
rm -f `find $RPM_BUILD_ROOT/%{_mandir}/man1 | grep -E "$PCP_GUI"`
|
||||
%else
|
||||
rm -rf $RPM_BUILD_ROOT/usr/share/doc/pcp-gui
|
||||
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop
|
||||
@ -588,10 +609,10 @@ done
|
||||
|
||||
# list of PMDAs in the base pkg
|
||||
ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
|
||||
egrep -v 'simple|sample|trivial|txmon' |\
|
||||
egrep -v 'perfevent|perfalloc.1' |\
|
||||
egrep -v '^ib$|infiniband' |\
|
||||
egrep -v 'papi' |\
|
||||
grep -E -v 'simple|sample|trivial|txmon' |\
|
||||
grep -E -v 'perfevent|perfalloc.1' |\
|
||||
grep -E -v '^ib$|infiniband' |\
|
||||
grep -E -v 'papi' |\
|
||||
sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list
|
||||
|
||||
# all base pcp package files except those split out into sub packages
|
||||
@ -609,18 +630,18 @@ ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos/tutorials |\
|
||||
ls -1 $RPM_BUILD_ROOT/%{_pixmapdir} |\
|
||||
sed -e 's#^#'%{_pixmapdir}'\/#' > pcp-gui.list
|
||||
cat base_bin.list base_exec.list base_man.list |\
|
||||
egrep "$PCP_GUI" >> pcp-gui.list
|
||||
grep -E "$PCP_GUI" >> pcp-gui.list
|
||||
%endif
|
||||
cat base_pmdas.list base_bin.list base_exec.list base_man.list |\
|
||||
egrep -v 'pmdaib|pmmgr|pmweb|pmsnap|2pcp' |\
|
||||
egrep -v "$PCP_GUI|pixmaps|pcp-doc|tutorials" |\
|
||||
egrep -v %{_confdir} | egrep -v %{_logsdir} > base.list
|
||||
grep -E -v 'pmdaib|pmmgr|pmweb|pmsnap|2pcp' |\
|
||||
grep -E -v "$PCP_GUI|pixmaps|pcp-doc|tutorials" |\
|
||||
grep -E -v %{_confdir} | grep -E -v %{_logsdir} > base.list
|
||||
|
||||
# all devel pcp package files except those split out into sub packages
|
||||
ls -1 $RPM_BUILD_ROOT/%{_mandir}/man3 |\
|
||||
sed -e 's#^#'%{_mandir}'\/man3\/#' | egrep -v '3pm|PMWEBAPI' >devel.list
|
||||
sed -e 's#^#'%{_mandir}'\/man3\/#' | grep -E -v '3pm|PMWEBAPI' >devel.list
|
||||
ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos |\
|
||||
sed -e 's#^#'%{_datadir}'\/pcp\/demos\/#' | egrep -v tutorials >> devel.list
|
||||
sed -e 's#^#'%{_datadir}'\/pcp\/demos\/#' | grep -E -v tutorials >> devel.list
|
||||
|
||||
%pre testsuite
|
||||
test -d %{_testsdir} || mkdir -p -m 755 %{_testsdir}
|
||||
@ -1033,8 +1054,10 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
|
||||
%files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list
|
||||
%defattr(-,root,root)
|
||||
|
||||
%if !%{disable_python2}
|
||||
%files -n python-pcp -f python-pcp.list.rpm
|
||||
%defattr(-,root,root)
|
||||
%endif
|
||||
|
||||
%if !%{disable_python3}
|
||||
%files -n python3-pcp -f python3-pcp.list.rpm
|
||||
@ -1057,6 +1080,10 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%changelog
|
||||
* Mon Dec 08 2014 Lukas Berk <lberk@redhat.com> - 3.10.2-0.21.g6bad98e
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Dec 01 2014 Nathan Scott <nathans@redhat.com> - 3.10.1-1
|
||||
- New conditionally-built pcp-pmda-perfevent sub-package.
|
||||
- Update to latest PCP sources.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user