From 4aff77d94fb9df9c387a1a8c1d628a1f7fde5bc7ccb02b75f89832acbb44d64e Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Mon, 13 Feb 2012 12:03:22 +0000 Subject: [PATCH] Accepting request 104442 from devel:openSUSE:Factory:patch-license patch license to follow spdx.org standard OBS-URL: https://build.opensuse.org/request/show/104442 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=12 --- pcp.changes | 5 +++++ pcp.spec | 57 ++++++++++++++++++++++++++++------------------------- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/pcp.changes b/pcp.changes index ea5a9a7..3c5302a 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 13 10:51:49 UTC 2012 - coolo@suse.com + +- patch license to follow spdx.org standard + ------------------------------------------------------------------- Thu Nov 10 20:39:01 CET 2011 - meissner@suse.de diff --git a/pcp.spec b/pcp.spec index 761bb7c..0829d50 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,7 +1,7 @@ # # spec file for package pcp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -15,17 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: pcp Version: 3.5.8 -Release: 3 +Release: 0 %define pcp_release 1 Summary: System-level performance monitoring and performance management -License: GPLv2 -Url: http://oss.sgi.com/projects/pcp +License: GPL-2.0 Group: System/Monitoring +Url: http://oss.sgi.com/projects/pcp Source: %{name}-%{version}-%{pcp_release}.src.tar.gz Requires: libpcp3 = %{version} Requires: bash gawk sed grep fileutils findutils @@ -35,7 +33,12 @@ Requires: sysconfig cpp Requires: initscripts %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf bison flex ncurses-devel procps readline-devel +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: flex +BuildRequires: ncurses-devel +BuildRequires: procps +BuildRequires: readline-devel BuildRequires: perl(ExtUtils::MakeMaker) Patch6: pcp-xenbuild.patch Patch9: static_lib_perms.diff @@ -54,9 +57,9 @@ applications to easily retrieve and process any subset of that data. # libpcp # %package -n libpcp3 -License: LGPLv2+ -Group: System/Libraries Summary: Performance Co-Pilot run-time libraries +License: LGPL-2.1+ +Group: System/Libraries Url: http://oss.sgi.com/projects/pcp/ Obsoletes: pcp < 3.0 AutoReq: no @@ -68,9 +71,9 @@ Performance Co-Pilot (PCP) run-time libraries # libpcp-devel # %package -n libpcp-devel -License: GPLv2 -Group: Development/Libraries/Other Summary: Performance Co-Pilot (PCP) development headers and documentation +License: GPL-2.0 +Group: Development/Libraries/Other Url: http://oss.sgi.com/projects/pcp/ Requires: libpcp3 = %{version} @@ -81,9 +84,9 @@ 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: GPLv2 -Group: System/Monitoring Summary: Performance Co-Pilot (PCP) Perl bindings and documentation +License: GPL-2.0 +Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} perl-base @@ -98,9 +101,9 @@ an application, etc. # perl-PCP-MMV # %package -n perl-PCP-MMV -License: GPLv2 -Group: System/Monitoring Summary: Performance Co-Pilot (PCP) Perl bindings for PCP Memory Mapped Values +License: GPL-2.0 +Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} perl-base @@ -116,9 +119,9 @@ and analysis with pmchart, pmie, pmlogger and other PCP tools. # perl-PCP-LogImport # %package -n perl-PCP-LogImport -License: GPLv2 -Group: System/Monitoring Summary: Performance Co-Pilot Perl bindings for importing external data +License: GPL-2.0 +Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} perl-base @@ -131,9 +134,9 @@ they can be replayed with standard PCP monitoring tools. # perl-PCP-LogSummary # %package -n perl-PCP-LogSummary -License: GPLv2 -Group: System/Monitoring Summary: Performance Co-Pilot Perl bindings for processing pmlogsummary output +License: GPL-2.0 +Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ Requires: pcp >= %{version} perl-base @@ -149,9 +152,9 @@ exporting this data into third-party tools (e.g. spreadsheets). # pcp-import-sar2pcp # %package import-sar2pcp -License: LGPLv2+ -Group: System/Monitoring Summary: Performance Co-Pilot tools for importing sar data into PCP archive logs +License: LGPL-2.1+ +Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ Requires: libpcp3 >= %{version} perl-PCP-LogImport >= %{version} sysstat @@ -163,9 +166,9 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-import-iostat2pcp # %package import-iostat2pcp -License: LGPLv2+ -Group: System/Monitoring Summary: Performance Co-Pilot tools for importing iostat data into PCP archive logs +License: LGPL-2.1+ +Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ Requires: libpcp3 >= %{version} perl-PCP-LogImport >= %{version} sysstat @@ -177,9 +180,9 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-import-sheet2pcp # %package import-sheet2pcp -License: LGPLv2+ -Group: System/Monitoring Summary: Performance Co-Pilot tools for importing spreadsheet data into PCP archive logs +License: LGPL-2.1+ +Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ Requires: libpcp3 >= %{version} perl-PCP-LogImport >= %{version} sysstat @@ -191,9 +194,9 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-import-mrtg2pcp # %package import-mrtg2pcp -License: LGPLv2+ -Group: System/Monitoring Summary: Performance Co-Pilot tools for importing MTRG data into PCP archive logs +License: LGPL-2.1+ +Group: System/Monitoring Url: http://oss.sgi.com/projects/pcp/ Requires: libpcp3 >= %{version} perl-PCP-LogImport >= %{version}