packages/pcp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!38 drop python2 subpackage

Browse Source 
From: @wangxiao65
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2020-10-30 10:14:24 +08:00 committed by Gitee
commit 88c8985143
2 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0004-modify-python2-to-python3.patch Normal file
View File

@ -0,0 +1,39 @@
From 7fecf25e72225dfd2b3e8ba04e7ec8773fed1df8 Mon Sep 17 00:00:00 2001
From: wangxiao <wangxiao65@huawei.com>
Date: Wed, 21 Oct 2020 21:47:04 +0800
Subject: [PATCH] modify python2.7 to python3.8
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 71574ce..dfd4ea6 100755
--- a/configure
+++ b/configure
@@ -7348,7 +7348,7 @@ fi
test -n "$PYTHON" && break
done
-test -n "$PYTHON" || PYTHON="python2.7"
+test -n "$PYTHON" || PYTHON="python3.8"
diff --git a/configure.ac b/configure.ac
index 2a94208..c42a17b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -785,7 +785,7 @@ AC_CHECK_PROGS(PYLINT, pylint, /bin/true)
AC_SUBST(PYLINT)
dnl check if python available for the build and runtime
-AC_CHECK_PROGS(PYTHON, python, python2.7)
+AC_CHECK_PROGS(PYTHON, python, python3.8)
AC_SUBST(PYTHON)
dnl check if python3 available for the build and runtime
--
2.23.0

22
pcp.spec
View File

@ -6,10 +6,12 @@
%global _with_bcc --with-pmdabcc=yes
%endif
%global __python3 python
Name: pcp
Version: 4.1.3
Summary: System-level performance monitoring and performance management
Release: 13
Release: 14
License: GPLv2+ and LGPLv2.1+ and CC-BY
URL: https://pcp.io
Source0: https://dl.bintray.com/pcp/source/pcp-4.1.3.tar.gz
@ -23,9 +25,10 @@ Patch6000: CVE-2019-3695-CVE-2019-3696.patch
Patch9000: 9000-fix-new-function-not-found-when-Install.patch
Patch9001: 0002-fix-some-pcp-pidstat-bugs.patch
Patch9002: 0003-fix-pcp-pidstat-bug.patch
Patch9003: 0004-modify-python2-to-python3.patch
BuildRequires: gcc gcc-c++ procps autoconf bison flex nss-devel rpm-devel avahi-devel xz-devel zlib-devel
BuildRequires: python2-devel python3-devel ncurses-devel readline-devel cyrus-sasl-devel papi-devel libpfm-devel >= 4
BuildRequires: python3-devel ncurses-devel readline-devel cyrus-sasl-devel papi-devel libpfm-devel >= 4
BuildRequires: libmicrohttpd-devel cairo-devel systemtap-sdt-devel boost-devel perl-generators perl-devel perl(strict)
BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) perl(JSON) perl(LWP::UserAgent) perl(Time::HiRes) perl(Digest::MD5)
BuildRequires: man systemd-devel desktop-file-utils qt5-qtbase-devel qt5-qtsvg-devel
@ -816,15 +819,6 @@ Requires: pcp pcp-doc pcp-system-tools pcp-pmda-dm pcp-pmda-nfsclient
%description zeroconf
This package installs configuration files to tweak indexes for PCP metrics.
%package -n python2-pcp
Summary: PCP Python2 bindings and documentation
License: GPLv2+
Requires: pcp = %{version}-%{release} python2
Obsoletes: python-pcp
%description -n python2-pcp
This package contains language bindings for the Performance Metric API (PMAPI) monitoring
tool and Performance Metric Domain Agent (PMDA) collector tool written in Python2.
%package -n python3-pcp
Summary: PCP Python3 bindings and documentation
License: GPLv2+
@ -870,6 +864,7 @@ This package installs selinux support files for PCP.
%patch9000 -p1
%patch9001 -p1
%patch9002 -p1
%patch9003 -p1
%build
@ -2202,8 +2197,6 @@ fi
%files -n perl-PCP-LogSummary -f perl-pcp-logsummary.list
%files -n python2-pcp -f python-pcp.list.rpm
%files -n python3-pcp -f python3-pcp.list.rpm
%files gui -f pcp-gui.list
@ -2225,6 +2218,9 @@ fi
%config(noreplace) /etc/pcp/pmrep/*
%changelog
* Wed Oct 21 2020 wangxiao <wangxiao65@huawei.com> - 4.1.3-14
- drop python2 subpackage
* Tue Sep 22 2020 zhangjiapeng <zhangjiapeng9@huawei.com> - 4.1.3-13
- fix pcp pidstat bug -a option