Accepting request 125460 from home:dmdiss:pcp_commonspec

- Remove invalid cpan/PMDA manifest entry. 
- 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.

OBS-URL: https://build.opensuse.org/request/show/125460
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=15
This commit is contained in:
David Disseldorp 2012-06-19 17:00:10 +00:00 committed by Git OBS Bridge
parent a7ba9d3f20
commit a1af99c104
5 changed files with 63 additions and 6 deletions

View File

@ -0,0 +1,36 @@
Index: pcp-3.6.4/src/cpan/PMDA/MANIFEST
===================================================================
--- pcp-3.6.4.orig/src/cpan/PMDA/MANIFEST
+++ pcp-3.6.4/src/cpan/PMDA/MANIFEST
@@ -9,4 +9,3 @@ local.h
local.c
test.pl
typemap
-META.yml Module meta-data (added by MakeMaker)
Index: pcp-3.6.4/src/cpan/LogImport/MANIFEST
===================================================================
--- pcp-3.6.4.orig/src/cpan/LogImport/MANIFEST
+++ pcp-3.6.4/src/cpan/LogImport/MANIFEST
@@ -5,4 +5,3 @@ MANIFEST
LogImport.pm
LogImport.xs
typemap
-META.yml Module meta-data (added by MakeMaker)
Index: pcp-3.6.4/src/cpan/LogSummary/MANIFEST
===================================================================
--- pcp-3.6.4.orig/src/cpan/LogSummary/MANIFEST
+++ pcp-3.6.4/src/cpan/LogSummary/MANIFEST
@@ -18,4 +18,3 @@ t/db/20081125.0
t/db/20081126.index
t/db/20081126.meta
t/db/20081126.0
-META.yml Module meta-data (added by MakeMaker)
Index: pcp-3.6.4/src/cpan/MMV/MANIFEST
===================================================================
--- pcp-3.6.4.orig/src/cpan/MMV/MANIFEST
+++ pcp-3.6.4/src/cpan/MMV/MANIFEST
@@ -7,4 +7,3 @@ MMV.xs
server.pl
test.pl
typemap
-META.yml Module meta-data (added by MakeMaker)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42725b5ce2f59cb4a5249eb5d20e31ceb1f9bf5199acb3504f4a4aca414b1cc1
size 2406359

3
pcp-3.6.4-1.src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac6de94daf87b4b514cc8abd71a758c22ab63a5bf7840bae19cabd6771543b23
size 2409400

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Mon Jun 18 11:01:29 UTC 2012 - ddiss@suse.com
- Remove invalid cpan/PMDA manifest entry.
-------------------------------------------------------------------
Fri Jun 15 14:59:26 UTC 2012 - ddiss@suse.com
- 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 - ddiss@suse.com Wed Jun 6 12:49:13 UTC 2012 - ddiss@suse.com

View File

@ -19,7 +19,7 @@
Summary: System-level performance monitoring and performance management Summary: System-level performance monitoring and performance management
Name: pcp Name: pcp
Version: 3.6.3 Version: 3.6.4
Release: 1 Release: 1
%define buildversion 1 %define buildversion 1
@ -61,12 +61,16 @@ Patch10: pcp_legacy_init_lsb.patch
Patch11: fix_configure_path_tests.patch Patch11: fix_configure_path_tests.patch
Patch12: configure_append_pcp_subdir.patch Patch12: configure_append_pcp_subdir.patch
Patch13: remove_cpan_rpaths.patch Patch13: remove_cpan_rpaths.patch
Patch14: fix_cpan_pmda_manifest.patch
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
Requires: sysconfig cpp Requires: sysconfig cpp
%else %else
Requires: initscripts Requires: initscripts
BuildRequires: initscripts BuildRequires: initscripts
%if (0%{?fedora} > 0)
AutoReq: no
%endif
%endif %endif
Requires: bash gawk sed grep fileutils findutils Requires: bash gawk sed grep fileutils findutils
Requires: %{lib_pkg} = %{version} Requires: %{lib_pkg} = %{version}
@ -106,6 +110,9 @@ Summary: Performance Co-Pilot (PCP) development headers and documentation
Url: http://oss.sgi.com/projects/pcp/ Url: http://oss.sgi.com/projects/pcp/
Requires: %{lib_pkg} = %{version} Requires: %{lib_pkg} = %{version}
Conflicts: %{lib_devel_pkg_conflict} Conflicts: %{lib_devel_pkg_conflict}
%if (0%{?fedora} > 0)
AutoReq: no
%endif
%description -n %{lib_devel_pkg} %description -n %{lib_devel_pkg}
Performance Co-Pilot (PCP) headers, documentation and tools for development. Performance Co-Pilot (PCP) headers, documentation and tools for development.
@ -254,6 +261,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
autoconf autoconf
%configure --localstatedir=/var/lib %configure --localstatedir=/var/lib
@ -360,10 +368,9 @@ fi
%{_datadir}/doc/packages/pcp-%{version} %{_datadir}/doc/packages/pcp-%{version}
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
%{_sbindir}/rc* %{_sbindir}/rc*
%else
%dir %{_localstatedir}/run/pcp
%endif %endif
%ghost %dir %{_localstatedir}/run/pcp
%dir %{_pmdasdir} %dir %{_pmdasdir}
%dir %{_datadir}/pcp %dir %{_datadir}/pcp
%dir %{_localstatedir}/lib/pcp %dir %{_localstatedir}/lib/pcp