Hello community, here is the log from the commit of package pcp.608 for openSUSE:12.2:Update checked in at 2012-08-09 17:01:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/pcp.608 (Old) and /work/SRC/openSUSE:12.2:Update/.pcp.608.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcp.608", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-08-03 19:43:57.387656292 +0200 +++ /work/SRC/openSUSE:12.2:Update/.pcp.608.new/pcp.changes 2012-08-09 17:01:02.000000000 +0200 @@ -0,0 +1,895 @@ +------------------------------------------------------------------- +Mon Jul 30 11:54:34 UTC 2012 - [email protected] + +- use addFilter for rpmlintrc, setBadness is not acceptable for Factory. + +------------------------------------------------------------------- +Thu Jul 19 15:28:03 UTC 2012 - [email protected] + +- Spec file cleanups following feedback from Sascha. + + Do not remove the buildroot as part of %install + + Use %suse_version rather than %_vendor + + Add pcp-rpmlintrc script for devel-file-in-non-devel-package errors + + Remove runlevel 4 references from init scripts + + Add explicit perl version Requires + +------------------------------------------------------------------- +Wed Jun 27 10:36:49 UTC 2012 - [email protected] + +- Remove fix_cpan_pmda_manifest.patch, no longer needed with fixed + upstream tarball. + +------------------------------------------------------------------- +Mon Jun 18 11:01:29 UTC 2012 - [email protected] + +- Remove invalid cpan/PMDA manifest entry. + +------------------------------------------------------------------- +Fri Jun 15 14:59:26 UTC 2012 - [email protected] + +- Update to pcp-3.6.4. + + Fix build on s390x platform (thanks to Dan Horak) + + Rethink order of PATH setting for pcp start scripts, to ensure + binaries from other packages with names that conflict with pcp + binaries are not found ahead of the same-named pcp binary. + +------------------------------------------------------------------- +Wed Jun 6 12:49:13 UTC 2012 - [email protected] + +- Use upstream based spec file to support combined SUSE/RH builds; + (bnc#732763). + +- Update to pcp-3.6.3. + + Revert initial attempt at getting configure --prefix option to + make sense for local developer PCP installations + + Fix RPM changelog typo in in-tree spec file + + Further work on Debian/kFreeBSD port (thanks to Robert Millan) + +- Update to pcp-3.6.2. + + Fix Debian builds on FreeBSD (missing header files) + + Resolve Debian startup script (compat) lintian issue + + Resolve FreeBSD kernel PMDA build issue with PCP not installed + in the build root already. + +- Update to pcp-3.6.1. + + Resolve final Mac OS X pthreads build issues + + Debian packaging improvements for split pmlogger/pmcd scripts, + perl module pieces, and other lintian reported issues + + Update the startup script dependencies for /var use + + Support --prefix=... and --exec-prefix=... configure options + + Relaxed the "are you running as root?" test in startup scripts + + Win32 build updates and improvements + + Cache /proc/stat file handle in Linux kernel agent to reduce + syscalls on the most commonly fetched metric subtree + +- Update to pcp-3.6.0. + + Thread-safe libpcp, including additional re-entrant and thread-safe + variants for some routines + + Retire all asynchronous routines from libpcp + + Retire all V1 protocols and services (archive format, PMAPI and + PMDA_INTERFACE) + + PMNS moves to ASCII only (no binary PMNS) + + Rework "init" scripts, splitting pcp into pmcd and pmlogger + + Update elasticsearch PMDA to 0.19+, new transport and shard metrics + + Updates to PMDA new event queueing interfaces for agents wishing to + export that class of performance data. + + First round of Coverity cleanup fixes incorporated. + + Initial version of the SNMP PMDA, thanks to Hamish Coleman. + + Updates to postgres PMDA to export additional recovery metrics. + +- Update to pcp-3.5.11. + + Update FSF contact address in copyright notices to keep + rpmlint happy. + + Fix instance domain checks in elasticsearch PMDA. + + Make KVM PMDA to run as root once more (permissions issues). + + Integration of pmlogger_daily with pmlogrewrite. + + Fix pmlogger_merge corner case for empty archives. + +- Update to pcp-3.5.10. + + Support new 0.18+ elasticsearch metrics. + + Fix handling of elasticsearch version metric cluster. + + Fix trace PMDA build issues. + + Fix some Win32 build issues. + + Run with reduced privileges for more of the perl PMDAs. + + Name Solaris load average metric consistently. + + Small metric documentation tweaks for Solaris PMDA. + +- Update to pcp-3.5.9. + + Add rc script support for condrestart, and condrestart the pcp, + pmie and pmproxy services after an RPM install or upgrade. + + Fix a bug where hinv.ndisk is incorrect if CLUSTER_PARTITIONS + hasn't yet been refreshed immediately following a restart. + + Implementation of client event queueing logic for all PMDAs to + share (all PMDAs wishing to support event metrics, that is). + + New manual pages for new PMDA event queueing interfaces. + + PostgreSQL PMDA, supporting versions 9.0 and 9.1 (at least). + + Reserved ID 111 for Samba Clustered Trivial Database PMDA. + + Add perl interface to allow PMDAs to drop priveleges + + Add an elasticsearch version metric. + + Correct perl module type detection logic for 32/64-bit systems. + + Small pmlogconf source and man page fixes. + + Rework flex usage to resolve build warnings. + + Make Darwin CPU metrics 64 bit. + + Add (long) opaque key support to libpcp_pmda. + + Add pmdaCacheStoreInst() routine to libpcp_pmda. + + Added mssql PMDA for SQL server Dynamic Management View stats. + + Add pmlogrewrite(1) to rewrite archives (fix inconsistencies). + + Fix a cgroup option parsing error on consecutive fetch calls. + +------------------------------------------------------------------- +Mon Feb 13 10:51:49 UTC 2012 - [email protected] + +- patch license to follow spdx.org standard + +------------------------------------------------------------------- +Thu Nov 10 20:39:01 CET 2011 - [email protected] + +- wildcard a bit to make it package on ppc + +------------------------------------------------------------------- +Wed Aug 10 12:39:05 CEST 2011 - [email protected] + +- Update to pcp-3.5.8. + + Rework rsyslog PMDA to remove Switch use, very odd behaviour + observed on RHEL5.2 (mysteriously failing to compile). + + Add in Kens scripting defenses against dodgey toolchains. + +------------------------------------------------------------------- +Tue Aug 9 10:56:34 CEST 2011 - [email protected] + +- Update to pcp-3.5.7. + + Fix build issue on SLES11 SP1 IA64 systems. + + Improved rsyslog PMDA handling of queue metrics. + + Add open file-descriptor count metric to the Linux PMDA. + + Implement logger PMDA line-oriented event mode. + + Add regular expression based event filtering in logger PMDA. + + The default pmcd.conf now has an access control section, and + all remote store operations are blocked by default. + +------------------------------------------------------------------- +Mon Aug 1 18:50:18 CEST 2011 - [email protected] + +- Update to pcp-3.5.6. + + Fix warning from pmie_daily with some /bin/pwd versions. + + Numerous Debian packaging updates for lintian cleanliness. + + Fixed typos in several man pages. + + Added ElasticSearch PMDA. + + Fix build on RHEL4 with older sys/queue.h variant. + +------------------------------------------------------------------- +Thu Jul 7 12:17:17 CEST 2011 - [email protected] + +- Update to pcp-3.5.5. + + Resolve Debian packaging issues preventing new uploads. + + Fix warnings from pmie_check with some /bin/pwd versions. + +- Update to pcp-3.5.4. + + Fix warnings from pmlogger_check with some /bin/pwd versions. + +- Update to pcp-3.5.3. + + Remove reliance on a cpp binary being installed locally. + + Ensure compressed pmie log files are also cleaned up daily. + + Extend the event store mechanism to be more generally useful. + + Add memory limiting functionality to pmdalogger. + + Add SQLServer metric for user settable queries. + + Fix potential sigsegv in pmprobe fetching multiple live values. + + Perl changes for Solaris. + + Fix Fedora15 build relating to handling of systemd. + + Solaris pmda zpool_vdev_name() api change. + + Update sar2pcp for sysstat version 9.1.7. + + Resolve realloc issue in event metric handling in libpcp_pmda. + +- Update to pcp-3.5.2. + + pmlogreduce - fix 2 problems (memory leak, additional mark records) + + Initial version of pmdalogger, from David Smith, a log monitoring + PMDA exporting event metrics. + + Make Windows drive instance domain code less chatty. + + RC scripts and pmie_check - Mac OS X porting + + pmlogger_check - symbolic link issue fixed + + Add in the rsyslog PMDA (http://www.rsyslog.com) + + Extend PCP::PMDA so that the log tail mode can be used on named papes. + + Numerous updates to the Perl packaging infrastructure + + Fix build when $HOME is not set. + + pmlogconf - another non-posix awk issue fixed + + Darwin pmda - filesys.maxfiles metric + + pmie_daily - assorted minor fixups + + Unix domain socket issue found on Mac OS X + + pmcd config parsing error handling cleanup ++++ 698 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.pcp.608.new/pcp.changes New: ---- configure_append_pcp_subdir.patch fix_configure_path_tests.patch pcp-3.6.4-1.src.tar.gz pcp-rpmlintrc pcp-xenbuild.patch pcp.changes pcp.spec pcp_legacy_init_lsb.patch remove_cpan_rpaths.patch rm_init_script_runlevel_4.patch static_lib_perms.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ # # spec file for package pcp # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Summary: System-level performance monitoring and performance management Name: pcp Version: 3.6.4 Release: 1 %define buildversion 1 %if (0%{?suse_version} > 0) %define pcp_gr System/Monitoring %define lib_pkg libpcp3 %define lib_pkg_conflict pcp-libs %define lib_gr System/Libraries %define lib_devel_pkg libpcp-devel %define lib_devel_pkg_conflict pcp-libs-devel %define lib_devel_gr Development/Libraries/Other %define license_gplv2 GPL-2.0 %define license_lgplv2 LGPL-2.0 %define license_lgplv2plus LGPL-2.1+ %define perl_version %(perl -V:version | sed "s!.*='!!;s!'.*!!") %else %define pcp_gr Applications/System %define lib_pkg pcp-libs %define lib_pkg_conflict libpcp3 %define lib_gr Applications/System %define lib_devel_pkg pcp-libs-devel %define lib_devel_pkg_conflict libpcp-devel %define lib_devel_gr Applications/System %define license_gplv2 GPLv2 %define license_lgplv2 LGPLv2 %define license_lgplv2plus LGPLv2+ %endif License: %{license_gplv2} Url: http://oss.sgi.com/projects/pcp Group: %{pcp_gr} Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.tar.gz Source1: pcp-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf bison flex ncurses-devel procps readline-devel BuildRequires: perl(ExtUtils::MakeMaker) Patch6: pcp-xenbuild.patch Patch9: static_lib_perms.diff Patch10: pcp_legacy_init_lsb.patch Patch11: fix_configure_path_tests.patch Patch12: configure_append_pcp_subdir.patch Patch13: remove_cpan_rpaths.patch Patch14: rm_init_script_runlevel_4.patch %if (0%{?suse_version} > 0) Requires: sysconfig cpp %else Requires: initscripts BuildRequires: initscripts %if (0%{?fedora} > 0) AutoReq: no %endif %endif Requires: bash gawk sed grep fileutils findutils Requires: %{lib_pkg} = %{version} %define _pmdasdir %{_localstatedir}/lib/pcp/pmdas %description Performance Co-Pilot (PCP) provides a framework and services to support system-level performance monitoring and performance management. The PCP open source release provides a unifying abstraction for all of the interesting performance data in a system, and allows client applications to easily retrieve and process any subset of that data. # # pcp-libs # %package -n %{lib_pkg} License: %{license_lgplv2} Group: %{lib_gr} Summary: Performance Co-Pilot run-time libraries Url: http://oss.sgi.com/projects/pcp/ Conflicts: %{lib_pkg_conflict} AutoReq: no %description -n %{lib_pkg} Performance Co-Pilot (PCP) run-time libraries # # pcp-libs-devel # %package -n %{lib_devel_pkg} License: %{license_gplv2} Group: %{lib_devel_gr} Summary: Performance Co-Pilot (PCP) development headers and documentation Url: http://oss.sgi.com/projects/pcp/ Requires: %{lib_pkg} = %{version} Conflicts: %{lib_devel_pkg_conflict} %if (0%{?fedora} > 0) AutoReq: no %endif %description -n %{lib_devel_pkg} Performance Co-Pilot (PCP) headers, documentation and tools for development. # # perl-PCP-PMDA. This is the PCP agent perl binding. # %package -n perl-PCP-PMDA License: %{license_gplv2} Group: %{pcp_gr} Summary: Performance Co-Pilot (PCP) Perl bindings and documentation Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} %if (0%{?suse_version} > 0) Requires: perl = %{perl_version} %endif %description -n perl-PCP-PMDA The PCP::PMDA Perl module contains the language bindings for building Performance Metric Domain Agents (PMDAs) using Perl. Each PMDA exports performance data for one specific domain, for example the operating system kernel, Cisco routers, a database, an application, etc. # # perl-PCP-MMV # %package -n perl-PCP-MMV License: %{license_gplv2} Group: %{pcp_gr} Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} %if (0%{?suse_version} > 0) Requires: perl = %{perl_version} %endif %description -n perl-PCP-MMV The PCP::MMV module contains the Perl language bindings for building scripts instrumented with the Performance Co-Pilot (PCP) Memory Mapped Value (MMV) mechanism. This mechanism allows arbitrary values to be exported from an instrumented script into the PCP infrastructure for monitoring and analysis with pmchart, pmie, pmlogger and other PCP tools. # # perl-PCP-LogImport # %package -n perl-PCP-LogImport License: %{license_gplv2} Group: %{pcp_gr} Summary: Performance Co-Pilot Perl bindings for importing external archive data Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} %if (0%{?suse_version} > 0) Requires: perl = %{perl_version} %endif %description -n perl-PCP-LogImport The PCP::LogImport module contains the Perl language bindings for importing data in various 3rd party formats into PCP archives so they can be replayed with standard PCP monitoring tools. # # perl-PCP-LogSummary # %package -n perl-PCP-LogSummary License: %{license_gplv2} Group: %{pcp_gr} Summary: Performance Co-Pilot Perl bindings for processing pmlogsummary output Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} %if (0%{?suse_version} > 0) Requires: perl = %{perl_version} %endif %description -n perl-PCP-LogSummary The PCP::LogSummary module provides a Perl module for using the statistical summary data produced by the Performance Co-Pilot pmlogsummary utility. This utility produces various averages, minima, maxima, and other calculations based on the performance data stored in a PCP archive. The Perl interface is ideal for exporting this data into third-party tools (e.g. spreadsheets). # # pcp-import-sar2pcp # %package import-sar2pcp License: %{license_lgplv2plus} Group: %{pcp_gr} Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs Url: http://oss.sgi.com/projects/pcp/ Requires: %{lib_pkg} >= %{version} perl-PCP-LogImport >= %{version} sysstat %description import-sar2pcp Performance Co-Pilot (PCP) front-end tools for importing sar data into standard PCP archive logs for replay with any PCP monitoring tool. # # pcp-import-iostat2pcp # %package import-iostat2pcp License: %{license_lgplv2plus} Group: %{pcp_gr} Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs Url: http://oss.sgi.com/projects/pcp/ Requires: %{lib_pkg} >= %{version} perl-PCP-LogImport >= %{version} sysstat %description import-iostat2pcp Performance Co-Pilot (PCP) front-end tools for importing iostat data into standard PCP archive logs for replay with any PCP monitoring tool. # # pcp-import-sheet2pcp # %package import-sheet2pcp License: %{license_lgplv2plus} Group: %{pcp_gr} Summary: Performance Co-Pilot tools for importing spreadsheet data into PCP archive logs Url: http://oss.sgi.com/projects/pcp/ Requires: %{lib_pkg} >= %{version} perl-PCP-LogImport >= %{version} sysstat %description import-sheet2pcp Performance Co-Pilot (PCP) front-end tools for importing spreadsheet data into standard PCP archive logs for replay with any PCP monitoring tool. # # pcp-import-mrtg2pcp # %package import-mrtg2pcp License: %{license_lgplv2plus} Group: %{pcp_gr} Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs Url: http://oss.sgi.com/projects/pcp/ Requires: %{lib_pkg} >= %{version} perl-PCP-LogImport >= %{version} %description import-mrtg2pcp Performance Co-Pilot (PCP) front-end tools for importing MTRG data into standard PCP archive logs for replay with any PCP monitoring tool. %prep %setup -q %patch6 %patch9 %patch10 %patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 autoconf %configure --localstatedir=/var/lib %clean rm -Rf $RPM_BUILD_ROOT %build make default_pcp %install export DIST_ROOT=$RPM_BUILD_ROOT make install_pcp # Fix stuff we do/don't want to ship rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pcp %if (0%{?suse_version} > 0) # add /etc/init.d/X symlinks at /usr/sbin/rcX %__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sbindir} for script in pcp pmie pmproxy pmlogger pmcd; do ln -s "%{_sysconfdir}/init.d/${script}" "${RPM_BUILD_ROOT}/%{_sbindir}/rc${script}" done %else # default chkconfig off for Fedora and RHEL for f in $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/{pcp,pmie,pmproxy}; do sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f done %endif # list of PMDAs in the base pkg ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} | egrep -v 'simple|sample|trivial|txmon' |\ sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list # bin and man1 files except those split out into sub packages # man pages are transparently compressed so append a '*' suffix ls -1 $RPM_BUILD_ROOT/%{_bindir} | grep -v '2pcp' |\ sed -e 's#^#'%{_bindir}'\/#' >base_binfiles.list ls -1 $RPM_BUILD_ROOT/%{_mandir}/man1 | grep -v '2pcp' |\ sed -e 's#^#'%{_mandir}'\/man1\/#' |\ sed -e 's#$#*#' >base_man1files.list cat base_pmdas.list base_binfiles.list base_man1files.list > base_specialfiles.list %if (0%{?suse_version} > 0) %preun %{?stop_on_removal:%{stop_on_removal pmlogger pmie pmproxy pmcd}} %postun /sbin/ldconfig %{?restart_on_update:%{restart_on_update pcp pmproxy pmie}} %{?insserv_cleanup:%{insserv_cleanup}} %post /sbin/ldconfig %else %preun if [ "$1" -eq 0 ] then # # Stop daemons before erasing the package # /sbin/service pmlogger stop >/dev/null 2>&1 /sbin/service pmie stop >/dev/null 2>&1 /sbin/service pmproxy stop >/dev/null 2>&1 /sbin/service pcp stop >/dev/null 2>&1 /sbin/service pmcd stop >/dev/null 2>&1 /sbin/chkconfig --del pcp >/dev/null 2>&1 /sbin/chkconfig --del pmcd >/dev/null 2>&1 /sbin/chkconfig --del pmlogger >/dev/null 2>&1 /sbin/chkconfig --del pmie >/dev/null 2>&1 /sbin/chkconfig --del pmproxy >/dev/null 2>&1 fi %post /sbin/chkconfig --add pmcd >/dev/null 2>&1 /sbin/service pmcd condrestart /sbin/chkconfig --add pmlogger >/dev/null 2>&1 /sbin/service pmlogger condrestart /sbin/chkconfig --add pmie >/dev/null 2>&1 /sbin/service pmie condrestart /sbin/chkconfig --add pmproxy >/dev/null 2>&1 /sbin/service pmproxy condrestart %endif %post -n %{lib_pkg} -p /sbin/ldconfig %postun -n %{lib_pkg} -p /sbin/ldconfig %files -f base_specialfiles.list # # Note: there are some headers (e.g. domain.h) and in a few cases some # C source files that rpmlint complains about. These are not devel files, # but rather they are (slightly obscure) PMDA config files. # %defattr(-,root,root) # pcp_doc_dir should be derived from a configure option, currently it's not %{_datadir}/doc/packages/pcp-%{version} %if (0%{?suse_version} > 0) %{_sbindir}/rc* %endif %ghost %dir %{_localstatedir}/run/pcp %dir %{_pmdasdir} %dir %{_datadir}/pcp %dir %{_localstatedir}/lib/pcp %dir %{_localstatedir}/lib/pcp/config %{_libexecdir}/pcp %{_datadir}/pcp/lib %{_localstatedir}/log/pcp %{_localstatedir}/lib/pcp/pmns %{_initrddir}/pcp %{_initrddir}/pmcd %{_initrddir}/pmlogger %{_initrddir}/pmie %{_initrddir}/pmproxy %{_mandir}/man4/* %config %{_sysconfdir}/bash_completion.d/pcp %config %{_sysconfdir}/pcp.env %config(noreplace) %{_localstatedir}/lib/pcp/config/pmcd/pmcd.conf %config(noreplace) %{_localstatedir}/lib/pcp/config/pmcd/pmcd.options %config(noreplace) %{_localstatedir}/lib/pcp/config/pmcd/rc.local %config(noreplace) %{_localstatedir}/lib/pcp/config/pmie/config.default %config(noreplace) %{_localstatedir}/lib/pcp/config/pmie/control %config(noreplace) %{_localstatedir}/lib/pcp/config/pmie/crontab %config(noreplace) %{_localstatedir}/lib/pcp/config/pmlogger/config.default %config(noreplace) %{_localstatedir}/lib/pcp/config/pmlogger/control %config(noreplace) %{_localstatedir}/lib/pcp/config/pmlogger/crontab %config(noreplace) %{_localstatedir}/lib/pcp/config/pmproxy/pmproxy.options %{_localstatedir}/lib/pcp/config/* %files -n %{lib_pkg} %defattr(-,root,root) %dir %{_includedir}/pcp %{_includedir}/pcp/builddefs %{_includedir}/pcp/buildrules %config %{_sysconfdir}/pcp.conf %{_libdir}/libpcp.so.3 %{_libdir}/libpcp_gui.so.2 %{_libdir}/libpcp_mmv.so.1 %{_libdir}/libpcp_pmda.so.3 %{_libdir}/libpcp_trace.so.2 %{_libdir}/libpcp_import.so.1 %files -n %{lib_devel_pkg} %defattr(-,root,root) %{_libdir}/libpcp.so %{_libdir}/libpcp.so.2 %{_libdir}/libpcp_gui.so %{_libdir}/libpcp_gui.so.1 %{_libdir}/libpcp_mmv.so %{_libdir}/libpcp_pmda.so %{_libdir}/libpcp_pmda.so.2 %{_libdir}/libpcp_trace.so %{_libdir}/libpcp_import.so %{_includedir}/pcp/*.h %{_mandir}/man3/*.3.gz %{_datadir}/pcp/demos %{_datadir}/pcp/examples # PMDAs that ship src and are not for production use # straight out-of-the-box, for devel or QA use only. %{_localstatedir}/lib/pcp/pmdas/simple %{_localstatedir}/lib/pcp/pmdas/sample %{_localstatedir}/lib/pcp/pmdas/trivial %{_localstatedir}/lib/pcp/pmdas/txmon %files import-sar2pcp %defattr(-,root,root) %{_bindir}/sar2pcp %{_mandir}/man1/sar2pcp.1.gz %files import-iostat2pcp %defattr(-,root,root) %{_bindir}/iostat2pcp %{_mandir}/man1/iostat2pcp.1.gz %files import-sheet2pcp %defattr(-,root,root) %{_bindir}/sheet2pcp %{_mandir}/man1/sheet2pcp.1.gz %files import-mrtg2pcp %defattr(-,root,root) %{_bindir}/mrtg2pcp %{_mandir}/man1/mrtg2pcp.1.gz %files -n perl-PCP-PMDA -f perl-pcp-pmda.list %defattr(-,root,root) %if (0%{?suse_version} > 0) %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/PMDA %endif %files -n perl-PCP-MMV -f perl-pcp-mmv.list %defattr(-,root,root) %if (0%{?suse_version} > 0) %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/MMV %endif %files -n perl-PCP-LogImport -f perl-pcp-logimport.list %defattr(-,root,root) %if (0%{?suse_version} > 0) %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP %dir %{_prefix}/lib/perl5/vendor_perl/*/*-linux-thread-multi*/auto/PCP/LogImport %endif %files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list %defattr(-,root,root) %if (0%{?suse_version} > 0) %dir %{_prefix}/lib/perl5/vendor_perl/*/PCP %endif %changelog ++++++ configure_append_pcp_subdir.patch ++++++ >From 8ae41f7080de22383990ef477d28f148dfa403a7 Mon Sep 17 00:00:00 2001 From: David Disseldorp <[email protected]> Date: Tue, 5 Jun 2012 17:01:28 +0200 Subject: [PATCH] build: append pcp sub-directory suffix With the fix to correctly handle a --Xdir= configure arguments, a number of PCP specific paths need a pcp/ suffix to match default (no --Xdir=) paths. --- configure.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 6b83469..e25a7cc 100644 --- a/configure.in +++ b/configure.in @@ -1553,6 +1553,8 @@ then else pcp_share_dir=/usr/pcp fi +else + pcp_share_dir=`eval echo $pcp_share_dir/pcp` fi AC_SUBST(pcp_share_dir) @@ -1598,6 +1600,8 @@ then else pcp_var_dir=/usr fi +else + pcp_var_dir=`eval echo $pcp_var_dir/pcp` fi AC_SUBST(pcp_var_dir) @@ -1852,6 +1856,8 @@ then else pcp_inc_dir=/usr/include/pcp fi +else + pcp_inc_dir=`eval echo $pcp_inc_dir/pcp` fi AC_SUBST(pcp_inc_dir) -- 1.7.1 ++++++ fix_configure_path_tests.patch ++++++ >From 70b76abe42aca1c968feb3bfe20b74c61cf05db6 Mon Sep 17 00:00:00 2001 From: David Disseldorp <[email protected]> Date: Mon, 21 Nov 2011 18:40:36 +0100 Subject: [PATCH] build: fix configure path tests This commit fixes pcp_(share|binadm|var|lib|man)_dir configure tests: if test -z "`echo $pcp_share_dir | sed 's;/.*\$;;'`" Currently all tests evaluate to true when absolute paths are supplied, as sed replaces from the leading '/', rather than the end which appears to be the intended purpose. --- configure.in | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 46e3f27..6b83469 100644 --- a/configure.in +++ b/configure.in @@ -1539,7 +1539,7 @@ AC_SUBST(pcp_etc_dir) dnl shared PCP files (shareable for diskless) pcp_share_dir=`eval echo $datadir` pcp_share_dir=`eval echo $pcp_share_dir` -if test -z "`echo $pcp_share_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_share_dir | sed 's;/\s*\$;;'`" then if test $target_os = mingw then @@ -1559,7 +1559,7 @@ AC_SUBST(pcp_share_dir) dnl private PCP executables pcp_binadm_dir=`eval echo $libexecdir` pcp_binadm_dir=`eval echo $pcp_binadm_dir` -if test -z "`echo $pcp_binadm_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_binadm_dir | sed 's;/\s*\$;;'`" then if test $target_distro = debian then @@ -1581,7 +1581,7 @@ AC_SUBST(pcp_binadm_dir) dnl non-shared (i.e. system local) PCP files pcp_var_dir=`eval echo $localstatedir` pcp_var_dir=`eval echo $pcp_var_dir` -if test -z "`echo $pcp_var_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_var_dir | sed 's;/\s*\$;;'`" then if test $target_os = mingw then @@ -1654,7 +1654,7 @@ then else pcp_lib_dir=`eval echo $libdir` pcp_lib_dir=`eval echo $pcp_lib_dir` - if test -z "`echo $pcp_lib_dir | sed 's;/.*\$;;'`" + if test -z "`echo $pcp_lib_dir | sed 's;/\s*\$;;'`" then if test -d /usr/lib then @@ -1716,7 +1716,7 @@ need_old_tbl_header=false man_header= pcp_man_dir=`eval echo $mandir` pcp_man_dir=`eval echo $pcp_man_dir` -if test -z "`echo $pcp_man_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_man_dir | sed 's;/\s*\$;;'`" then dnl some low risk defaults if test $target_os = mingw @@ -1827,7 +1827,7 @@ AC_SUBST(need_old_tbl_header) dnl public binaries pcp_bin_dir=`eval echo $bindir` pcp_bin_dir=`eval echo $pcp_bin_dir` -if test -z "`echo $pcp_bin_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_bin_dir | sed 's;/\s*\$;;'`" then if test $target_os = mingw then @@ -1844,7 +1844,7 @@ AC_SUBST(pcp_bin_dir) dnl include files pcp_inc_dir=`eval echo $includedir` pcp_inc_dir=`eval echo $pcp_inc_dir` -if test -z "`echo $pcp_inc_dir | sed 's;/.*\$;;'`" +if test -z "`echo $pcp_inc_dir | sed 's;/\s*\$;;'`" then if test $target_os = mingw then -- 1.7.1 ++++++ pcp-rpmlintrc ++++++ # Note: there are some headers (e.g. domain.h) and in a few cases some # C source files that rpmlint complains about. These are not devel files, # but rather they are (slightly obscure) PMDA config files. # addFilter('E: devel-file-in-non-devel-package') ++++++ pcp-xenbuild.patch ++++++ Index: configure.in =================================================================== --- configure.in.orig +++ configure.in @@ -545,6 +545,7 @@ NR == 1 { if ($1 != "UID" && $1 != "US # Unix variants $2 == 1 && / init/ { print "OK"; exit } $2 == 1 && / \/etc\/init/ { print "OK"; exit } +$2 == 1 && / \/bin\/bash/ { print "OK"; exit } # Fedora 9 $2 == 1 && / \/sbin\/init/ { print "OK"; exit } # Fedora 15 ++++++ pcp_legacy_init_lsb.patch ++++++ Index: src/pmcd/rc_pcp =================================================================== --- src/pmcd/rc_pcp.orig +++ src/pmcd/rc_pcp @@ -31,12 +31,12 @@ # e.g. SuSE, where chkconfig is a perl script. ### BEGIN INIT INFO # Provides: pcp -# Required-Start: -# Should-Start: -# Required-Stop: -# Should-Stop: -# Default-Start: -# Default-Stop: +# Required-Start: $local_fs +# Should-Start: $network $remote_fs $syslog $time +# Required-Stop: $local_fs +# Should-Stop: $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 # Short-Description: Legacy control for PCP daemons # Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons ### END INIT INFO @@ -53,6 +53,8 @@ _usage() echo "Usage: $pmprog [-v] {start|restart|condrestart|stop|status|reload|force-reload}" } +echo "The pcp init script is depricated, pmcd and pmlogger should be used instead" + case "$1" in 'start'|'restart'|'condrestart'|'reload'|'force-reload') ++++++ remove_cpan_rpaths.patch ++++++ Index: pcp-3.6.3/src/cpan/PMDA/Makefile.PL =================================================================== --- pcp-3.6.3.orig/src/cpan/PMDA/Makefile.PL +++ pcp-3.6.3/src/cpan/PMDA/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "local.o PMDA.o"; $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_pmda/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_pmda -lpcp"]; + $libs = ["-lpcp_pmda -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc Index: pcp-3.6.3/src/cpan/LogImport/Makefile.PL =================================================================== --- pcp-3.6.3.orig/src/cpan/LogImport/Makefile.PL +++ pcp-3.6.3/src/cpan/LogImport/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "LogImport.o", $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp/src -L$ENV{PCP_TOPDIR}/src/libpcp_import/src -lpcp_import -lpcp"]; + $libs = ["-lpcp_import -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc Index: pcp-3.6.3/src/cpan/MMV/Makefile.PL =================================================================== --- pcp-3.6.3.orig/src/cpan/MMV/Makefile.PL +++ pcp-3.6.3/src/cpan/MMV/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "MMV.o"; $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; - $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_mmv/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_mmv -lpcp"]; + $libs = ["-lpcp_mmv -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { # standard ones, minus -arch ppc ++++++ rm_init_script_runlevel_4.patch ++++++ Index: pcp-3.6.4/src/pmcd/rc_pcp =================================================================== --- pcp-3.6.4.orig/src/pmcd/rc_pcp +++ pcp-3.6.4/src/pmcd/rc_pcp @@ -35,7 +35,7 @@ # Should-Start: $network $remote_fs $syslog $time # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Legacy control for PCP daemons # Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons Index: pcp-3.6.4/src/pmcd/rc_pmcd =================================================================== --- pcp-3.6.4.orig/src/pmcd/rc_pmcd +++ pcp-3.6.4/src/pmcd/rc_pmcd @@ -30,7 +30,7 @@ # Should-Start: $network $remote_fs $syslog $time # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmcd (the collection daemon for PCP) # Description: Configure and control pmcd (the collection daemon for the Performance Co-Pilot) Index: pcp-3.6.4/src/pmie/rc_pmie =================================================================== --- pcp-3.6.4.orig/src/pmie/rc_pmie +++ pcp-3.6.4/src/pmie/rc_pmie @@ -24,7 +24,7 @@ # Should-Start: $local_fs $network $syslog $time $pmcd # Required-Stop: $remote_fs # Should-Stop: $local_fs $network $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmie (performance inference engine for PCP) # Description: Configure and control pmie (the performance inference engine for the Performance Co-Pilot) Index: pcp-3.6.4/src/pmlogger/rc_pmlogger =================================================================== --- pcp-3.6.4.orig/src/pmlogger/rc_pmlogger +++ pcp-3.6.4/src/pmlogger/rc_pmlogger @@ -30,7 +30,7 @@ # Should-Start: $network $remote_fs $syslog $time $pmcd # Required-Stop: $local_fs # Should-Stop: $network $remote_fs $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmlogger (the performance metrics logger for PCP) # Description: Configure and control pmlogger (the performance metrics logger for the Performance Co-Pilot) Index: pcp-3.6.4/src/pmproxy/rc_pmproxy =================================================================== --- pcp-3.6.4.orig/src/pmproxy/rc_pmproxy +++ pcp-3.6.4/src/pmproxy/rc_pmproxy @@ -30,7 +30,7 @@ # Should-Start: $local_fs $network $syslog $time $pmcd # Required-Stop: $remote_fs # Should-Stop: $local_fs $network $syslog $pmcd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Control pmproxy (the pmcd proxy daemon for PCP) # Description: Configure and control pmproxy (the pmcd proxy daemon for the Performance Co-Pilot) ++++++ static_lib_perms.diff ++++++ Index: src/libpcp_pmda/src/GNUmakefile =================================================================== --- src/libpcp_pmda/src/GNUmakefile +++ src/libpcp_pmda/src/GNUmakefile @@ -65,7 +65,7 @@ $(LIBTARGET_V2): $(LIBTARGET_V3) include $(BUILDRULES) install : default - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ifneq "$(LIBTARGET_V1)" "" $(INSTALL) -S $(LIBTARGET_V3) $(PCP_LIB_DIR)/$(LIBTARGET_V1) endif @@ -73,7 +73,7 @@ ifneq "$(LIBTARGET_V2)" "" $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET_V2) endif ifneq "$(STATICLIBTARGET)" "" - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp : default Index: src/libpcp_trace/src/GNUmakefile =================================================================== --- src/libpcp_trace/src/GNUmakefile +++ src/libpcp_trace/src/GNUmakefile @@ -54,12 +54,12 @@ endif include $(BUILDRULES) install : default - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ifneq "$(SYMTARGET)" "" $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(SYMTARGET) endif ifneq "$(STATICLIBTARGET)" "" - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp : default Index: src/libpcp_gui/src/GNUmakefile =================================================================== --- src/libpcp_gui/src/GNUmakefile +++ src/libpcp_gui/src/GNUmakefile @@ -52,14 +52,14 @@ endif include $(BUILDRULES) install: default - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ifneq "$(SYMTARGET)" "" for tt in $(SYMTARGET); do \ $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \ done endif ifneq "$(STATICLIBTARGET)" "" - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp: default Index: src/libpcp_import/src/GNUmakefile =================================================================== --- src/libpcp_import/src/GNUmakefile +++ src/libpcp_import/src/GNUmakefile @@ -45,14 +45,14 @@ $(OBJECTS): $(HFILES) include $(BUILDRULES) install: default - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ifneq "$(SYMTARGET)" "" for tt in $(SYMTARGET); do \ $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \ done endif ifneq "$(STATICLIBTARGET)" "" - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp: default Index: src/libpcp_mmv/src/GNUmakefile =================================================================== --- src/libpcp_mmv/src/GNUmakefile +++ src/libpcp_mmv/src/GNUmakefile @@ -40,14 +40,14 @@ default: pcp $(LIBTARGET) $(SYMTARGET) $ include $(BUILDRULES) install: default - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ifneq "$(SYMTARGET)" "" for tt in $(SYMTARGET); do \ $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \ done endif ifneq "$(STATICLIBTARGET)" "" - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp: default Index: src/libpcp/src/GNUmakefile =================================================================== --- src/libpcp/src/GNUmakefile +++ src/libpcp/src/GNUmakefile @@ -93,14 +93,14 @@ kernel_pmda_dso = $(TARGET_OS) endif install : default - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) ifneq "$(SYMTARGET)" "" for tt in $(SYMTARGET); do \ $(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \ done endif ifneq "$(STATICLIBTARGET)" "" - $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif default_pcp : default -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
