Merge 3.9.3 build components
This commit is contained in:
Nathan Scott
parent
56f343e984
commit
1cb82b2342
1
.gitignore
vendored
1
.gitignore
vendored
@ -28,3 +28,4 @@ pcp-3.3.3-1.src.tar.gz
|
||||
/pcp-3.9.0.src.tar.gz
|
||||
/pcp-3.9.1.src.tar.gz
|
||||
/pcp-3.9.2.src.tar.gz
|
||||
/pcp-3.9.3.src.tar.gz
|
||||
|
||||
88
pcp.spec
88
pcp.spec
@ -1,6 +1,6 @@
|
||||
Summary: System-level performance monitoring and performance management
|
||||
Name: pcp
|
||||
Version: 3.9.2
|
||||
Version: 3.9.3
|
||||
%define buildversion 1
|
||||
|
||||
Release: %{buildversion}%{?dist}
|
||||
@ -19,14 +19,20 @@ BuildRequires: ncurses-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: libmicrohttpd-devel
|
||||
%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
|
||||
BuildRequires: systemd-devel
|
||||
%endif
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: qt4-devel >= 4.4
|
||||
|
||||
Requires: bash gawk sed grep fileutils findutils initscripts perl
|
||||
Requires: python
|
||||
@ -47,6 +53,8 @@ Requires: perl-PCP-PMDA = %{version}-%{release}
|
||||
%define _tempsdir %{_localstatedir}/lib/pcp/tmp
|
||||
%define _pmdasdir %{_localstatedir}/lib/pcp/pmdas
|
||||
%define _testsdir %{_localstatedir}/lib/pcp/testsuite
|
||||
%define _pixmapdir %{_datadir}/pcp-gui/pixmaps
|
||||
%define _booksdir %{_datadir}/doc/pcp-doc
|
||||
|
||||
%if 0%{?fedora} >= 20
|
||||
%define _with_doc --with-docdir=%{_docdir}/%{name}
|
||||
@ -338,6 +346,42 @@ Requires: pcp-libs = %{version}-%{release}
|
||||
The python PCP module contains the language bindings for
|
||||
building Performance Metric API (PMAPI) tools using Python.
|
||||
|
||||
#
|
||||
# pcp-gui package for Qt tools
|
||||
#
|
||||
%package -n pcp-gui
|
||||
License: GPLv2+ and LGPLv2+ and LGPLv2+ with exceptions
|
||||
Group: Applications/System
|
||||
Summary: Visualization tools for the Performance Co-Pilot toolkit
|
||||
URL: http://www.performancecopilot.org
|
||||
Requires: pcp-libs = %{version}-%{release}
|
||||
|
||||
%description -n pcp-gui
|
||||
Visualization tools for the Performance Co-Pilot toolkit.
|
||||
The pcp-gui package primarily includes visualization tools for
|
||||
monitoring systems using live and archived Performance Co-Pilot
|
||||
(PCP) sources.
|
||||
|
||||
#
|
||||
# pcp-doc package
|
||||
#
|
||||
%package -n pcp-doc
|
||||
Group: Documentation
|
||||
BuildArch: noarch
|
||||
Summary: Documentation and tutorial for the Performance Co-Pilot
|
||||
URL: http://www.performancecopilot.org
|
||||
|
||||
%description -n pcp-doc
|
||||
Documentation and tutorial for the Performance Co-Pilot
|
||||
Performance Co-Pilot (PCP) provides a framework and services to support
|
||||
system-level performance monitoring and performance management.
|
||||
|
||||
The pcp-doc package provides useful information on using and
|
||||
configuring the Performance Co-Pilot (PCP) toolkit for system
|
||||
level performance management. It includes tutorials, HOWTOs,
|
||||
and other detailed documentation about the internals of core
|
||||
PCP utilities and daemons, and the PCP graphical tools.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
@ -365,10 +409,14 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/pcp/configsz.h
|
||||
|
||||
%if %{disable_infiniband}
|
||||
# remove pmdainfiniband on platforms lacking IB devel packages.
|
||||
rm -f $RPM_BUILD_ROOT/%{_pmdasdir}/ib $RPM_BUILD_ROOT/man1/pmdaib.1.gz
|
||||
rm -f $RPM_BUILD_ROOT/%{_pmdasdir}/ib
|
||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pmdaib.1.gz
|
||||
rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/infiniband
|
||||
%endif
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT/usr/share/doc/pcp-gui
|
||||
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop
|
||||
|
||||
# default chkconfig off for Fedora and RHEL
|
||||
for f in $RPM_BUILD_ROOT/%{_initddir}/{pcp,pmcd,pmlogger,pmie,pmwebd,pmmgr,pmproxy}; do
|
||||
sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f
|
||||
@ -387,8 +435,18 @@ ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
|
||||
sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >base_exec.list
|
||||
ls -1 $RPM_BUILD_ROOT/%{_mandir}/man1 |\
|
||||
sed -e 's#^#'%{_mandir}'\/man1\/#' >base_man.list
|
||||
cat base_pmdas.list base_bin.list base_conf.list base_exec.list base_man.list |\
|
||||
ls -1 $RPM_BUILD_ROOT/%{_booksdir} |\
|
||||
sed -e 's#^#'%{_booksdir}'\/#' > pcp-doc.list
|
||||
ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos/tutorials |\
|
||||
sed -e 's#^#'%{_datadir}/pcp/demos/tutorials'\/#' >>pcp-doc.list
|
||||
ls -1 $RPM_BUILD_ROOT/%{_pixmapdir} |\
|
||||
sed -e 's#^#'%{_pixmapdir}'\/#' > pcp-gui.list
|
||||
PCP_GUI='pmchart|pmconfirm|pmdumptext|pmmessage|pmquery|pmsnap|pmtime'
|
||||
cat base_bin.list base_exec.list base_man.list |\
|
||||
egrep "$PCP_GUI" >> pcp-gui.list
|
||||
cat base_pmdas.list base_bin.list base_exec.list base_man.list |\
|
||||
egrep -v 'pmdaib|pmmgr|pmweb|2pcp' |\
|
||||
egrep -v "$PCP_GUI|pixmaps|pcp-doc|tutorials" |\
|
||||
egrep -v %{_confdir} | egrep -v %{_logsdir} > base.list
|
||||
|
||||
# all devel pcp package files except those split out into sub packages
|
||||
@ -717,7 +775,28 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
|
||||
%files -n python-pcp -f python-pcp.list.rpm
|
||||
%defattr(-,root,root)
|
||||
|
||||
%files -n pcp-gui -f pcp-gui.list
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%{_sysconfdir}/pcp/pmsnap
|
||||
%config(noreplace) %{_sysconfdir}/pcp/pmsnap
|
||||
%{_localstatedir}/lib/pcp/config/pmsnap
|
||||
%dir %{_localstatedir}/lib/pcp/config/pmsnap
|
||||
%{_localstatedir}/lib/pcp/config/pmchart
|
||||
%dir %{_localstatedir}/lib/pcp/config/pmchart
|
||||
%{_localstatedir}/lib/pcp/config/pmafm/pcp-gui
|
||||
%{_datadir}/applications/pmchart.desktop
|
||||
|
||||
%files -n pcp-doc -f pcp-doc.list
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%changelog
|
||||
* Thu May 15 2014 Nathan Scott <nathans@redhat.com> - 3.9.3-1
|
||||
- Merged pcp-gui and pcp-doc packages into core PCP.
|
||||
- Adopt slow-start capability in systemd PMDA (BZ 1073658)
|
||||
- Resolve pmcollectl network/disk mis-reporting (BZ 1097095)
|
||||
- Update to latest PCP sources.
|
||||
|
||||
* Tue Apr 15 2014 Dave Brolley <brolley@redhat.com> - 3.9.2-1
|
||||
- Improve pmdarpm(1) concurrency complications (BZ 1044297)
|
||||
- Fix pmconfig(1) shell output string quoting (BZ 1085401)
|
||||
@ -726,6 +805,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
|
||||
* Wed Mar 19 2014 Nathan Scott <nathans@redhat.com> - 3.9.1-1
|
||||
- Update to latest PCP sources.
|
||||
|
||||
* Thu Feb 20 2014 Nathan Scott <nathans@redhat.com> - 3.9.0-2
|
||||
- Workaround further PowerPC/tapset-related build fallout.
|
||||
|
||||
* Wed Feb 19 2014 Nathan Scott <nathans@redhat.com> - 3.9.0-1
|
||||
- Create new sub-packages for pcp-webapi and pcp-manager
|
||||
- Split configuration from pcp-libs into pcp-conf (multilib)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user