!76 Update to 5.3.7
From: @wk333 Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
3c6b87f4df
@ -1,37 +0,0 @@
|
|||||||
From c387219daf1869772e845d3090907047b991edd7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: baizg1107 <preloyalwhite@163.com>
|
|
||||||
Date: Thu, 17 Feb 2022 18:21:52 +0800
|
|
||||||
Subject: [PATCH] remove Wants=pmcd from pmlogger and pmie
|
|
||||||
|
|
||||||
---
|
|
||||||
src/pmie/pmie.service.in | 1 -
|
|
||||||
src/pmlogger/pmlogger.service.in | 1 -
|
|
||||||
2 files changed, 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/pmie/pmie.service.in b/src/pmie/pmie.service.in
|
|
||||||
index d234c8a..75696de 100644
|
|
||||||
--- a/src/pmie/pmie.service.in
|
|
||||||
+++ b/src/pmie/pmie.service.in
|
|
||||||
@@ -4,7 +4,6 @@ Documentation=man:pmie(1)
|
|
||||||
After=network-online.target pmcd.service
|
|
||||||
Before=pmie_check.timer pmie_daily.timer
|
|
||||||
BindsTo=pmie_check.timer pmie_daily.timer
|
|
||||||
-Wants=pmcd.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=notify
|
|
||||||
diff --git a/src/pmlogger/pmlogger.service.in b/src/pmlogger/pmlogger.service.in
|
|
||||||
index de0df29..db6a4db 100644
|
|
||||||
--- a/src/pmlogger/pmlogger.service.in
|
|
||||||
+++ b/src/pmlogger/pmlogger.service.in
|
|
||||||
@@ -4,7 +4,6 @@ Documentation=man:pmlogger(1)
|
|
||||||
After=network-online.target pmcd.service
|
|
||||||
Before=pmlogger_check.timer pmlogger_daily.timer
|
|
||||||
BindsTo=pmlogger_check.timer pmlogger_daily.timer
|
|
||||||
-Wants=pmcd.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=notify
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
Binary file not shown.
15
pcp.spec
15
pcp.spec
@ -51,14 +51,12 @@
|
|||||||
%global _with_snmp --with-pmdasnmp=yes
|
%global _with_snmp --with-pmdasnmp=yes
|
||||||
|
|
||||||
Name: pcp
|
Name: pcp
|
||||||
Version: 5.3.5
|
Version: 5.3.7
|
||||||
Summary: System-level performance monitoring and performance management
|
Summary: System-level performance monitoring and performance management
|
||||||
Release: 3
|
Release: 1
|
||||||
License: GPLv2+ and LGPLv2.1+ and CC-BY
|
License: GPL-2.0-or-later and LGPL-2.0-or-later and CC-BY-SA-3.0
|
||||||
URL: https://pcp.io
|
URL: https://pcp.io
|
||||||
Source0: https://github.com/performancecopilot/pcp/archive/refs/tags/5.3.5.tar.gz
|
Source0: https://github.com/performancecopilot/pcp/archive/refs/tags/%{version}.tar.gz
|
||||||
Patch0001: 0001-remove-Wants-pmcd-from-pmlogger-and-pmie.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: gcc gcc-c++
|
BuildRequires: gcc gcc-c++
|
||||||
BuildRequires: procps autoconf bison flex
|
BuildRequires: procps autoconf bison flex
|
||||||
@ -1373,6 +1371,8 @@ do \
|
|||||||
mv $tmpfile $DIST_ROOT/$PCP_SYSTEMDTMPFILES_DIR/$tmpfile; \
|
mv $tmpfile $DIST_ROOT/$PCP_SYSTEMDTMPFILES_DIR/$tmpfile; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
find %{buildroot} -type f -name '*.so' -exec strip '{}' ';'
|
||||||
|
|
||||||
%pre devel
|
%pre devel
|
||||||
test -d %{_testsdir} || mkdir -p -m 755 %{_testsdir}
|
test -d %{_testsdir} || mkdir -p -m 755 %{_testsdir}
|
||||||
getent group pcpqa >/dev/null || groupadd -r pcpqa
|
getent group pcpqa >/dev/null || groupadd -r pcpqa
|
||||||
@ -1928,6 +1928,9 @@ systemctl condrestart pmproxy.service >/dev/null 2>&1
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 21 2022 wangkai <wangkai385@h-partners.com> - 5.3.7-1
|
||||||
|
- Update to 5.3.7
|
||||||
|
|
||||||
* Sat Feb 26 2022 wangkai <wangkai385@huawei.com> - 5.3.5-3
|
* Sat Feb 26 2022 wangkai <wangkai385@huawei.com> - 5.3.5-3
|
||||||
- Add requires pcp-zeroconf to pcp-system-tools
|
- Add requires pcp-zeroconf to pcp-system-tools
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user