From 2b03366fb5b342ced1956ecf8ec47c82365792a3 Mon Sep 17 00:00:00 2001 From: Lukas Berk <lberk@redhat.com> Date: Wed, 29 Jun 2016 10:52:06 -0400 Subject: [PATCH] Automated weekly pcp rawhide release: 0.20160629git25d9bd6 --- .gitignore | 3 +++ pcp.spec | 21 ++++++++++++++------- sources | 6 +++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 67bee60..7e2089f 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,6 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.11.3.src.tar.gz /pcp-webjs-3.11.2.tar.gz /vector-1.1.0.tar.gz +/pcp-3.11.4-0.20160629git25d9bd6.tar.gz +/pcp-webjs-20160629gitcce8001.src.tar.gz +/vector-20160629git6d01399.tar.gz diff --git a/pcp.spec b/pcp.spec index ec78e2b..13fe9a3 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,18 +1,18 @@ Summary: System-level performance monitoring and performance management Name: pcp -Version: 3.11.3 -%global buildversion 1 +Version: 3.11.4 +%global buildversion 0 -Release: %{buildversion}%{?dist} +Release: 0.20160629git25d9bd6%{?dist} License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io Group: Applications/System # https://bintray.com/artifact/download/pcp/source/pcp-%{version}.src.tar.gz -Source0: %{name}-%{version}.src.tar.gz +Source0: %{name}-%{version}-0.20160629git25d9bd6.tar.gz # https://bintray.com/artifact/download/netflixoss/downloads/vector.tar.gz -Source1: vector-1.1.0.tar.gz +Source1: pcp-webjs-20160629gitcce8001.src.tar.gz # https://github.com/performancecopilot/pcp-webjs/archive/x.y.z.tar.gz -Source2: pcp-webjs-3.11.2.tar.gz +Source2: vector-20160629git6d01399.tar.gz %global disable_snmp 0 @@ -141,7 +141,10 @@ BuildRequires: cairo-devel %if !%{disable_sdt} BuildRequires: systemtap-sdt-devel %endif -BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker) +%if 0%{?rhel} == 0 || 0%{?rhel} > 5 +BuildRequires: perl-devel perl-generators +%endif +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: initscripts man %if !%{disable_systemd} BuildRequires: systemd-devel @@ -2632,6 +2635,10 @@ cd %endif %changelog +* Wed Jun 29 2016 Lukas Berk <lberk@redhat.com> - 3.11.4-0.20160629git25d9bd6 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Jun 17 2016 Nathan Scott <nathans@redhat.com> - 3.11.3-1 - Fix memory leak in derived metrics error handling (BZ 1331973) - Correctly propogate indom in mixed derived metrics (BZ 1337212, BZ 1336130) diff --git a/sources b/sources index 48bd21e..1ec3141 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -2afbdac61697d2e2421914ad77e282f2 pcp-3.11.3.src.tar.gz -b59b0234969a14dec723c26fbae1fdab pcp-webjs-3.11.2.tar.gz -e1723b57dc9dad46650cdaf001a0d6e7 vector-1.1.0.tar.gz +0f6462174a9e6896bee501a6fccbe6a5 pcp-3.11.4-0.20160629git25d9bd6.tar.gz +286ad4bee0b01fe53b005b9d0bab8a7c pcp-webjs-20160629gitcce8001.src.tar.gz +aed34af0e3b3504a3a46c3ce0693ce5c vector-20160629git6d01399.tar.gz