Merge branch 'master' into el5

This commit is contained in:
Nathan Scott 2013-03-26 09:54:00 +11:00
commit 7c9b516782

View File

@ -1,7 +1,7 @@
Summary: System-level performance monitoring and performance management Summary: System-level performance monitoring and performance management
Name: pcp Name: pcp
Version: 3.7.1 Version: 3.7.1
%define buildversion 1 %define buildversion 2
Release: %{buildversion}%{?dist} Release: %{buildversion}%{?dist}
License: GPLv2 License: GPLv2
@ -219,6 +219,7 @@ building Performance Metric API (PMAPI) tools using Python.
rm -Rf $RPM_BUILD_ROOT rm -Rf $RPM_BUILD_ROOT
%build %build
autoconf
%configure --with-rcdir=%{_initddir} --with-tmpdir=%{_tempsdir} %configure --with-rcdir=%{_initddir} --with-tmpdir=%{_tempsdir}
make default_pcp make default_pcp
@ -484,6 +485,9 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Mon Mar 25 2013 Nathan Scott <nathans@redhat.com> - 3.7.1-2
- Run autoconf before configure for latest scripts (BZ 926315).
* Wed Mar 20 2013 Nathan Scott <nathans@redhat.com> - 3.7.1-1 * Wed Mar 20 2013 Nathan Scott <nathans@redhat.com> - 3.7.1-1
- Update to latest PCP sources. - Update to latest PCP sources.
- Migrate all tempfiles correctly to the new tempdir hierarchy. - Migrate all tempfiles correctly to the new tempdir hierarchy.