diff --git a/bcc.spec b/bcc.spec index dc2b7aec5a9b49933070e68b5fe72af1232cdf89..f1707a1b96cd4240f9d97f7f1a855edf7250c970 100644 --- a/bcc.spec +++ b/bcc.spec @@ -1,6 +1,6 @@ Name: bcc Version: 0.23.0 -Release: 2 +Release: 3 Summary: BPF Compiler Collection (BCC) License: ASL 2.0 URL: https://github.com/iovisor/bcc @@ -52,13 +52,13 @@ BuildArch: noarch Examples for BPF Compiler Collection (BCC) -%package -n python3-bpfcc +%package -n python3-bcc Summary: Python3 bindings for BPF Compiler Collection (BCC) Requires: %{name} = %{version}-%{release} BuildArch: noarch -%{?python_provide:%python_provide python3-bpfcc} +%{?python_provide:%python_provide python3-bcc} -%description -n python3-bpfcc +%description -n python3-bcc Python3 bindings for BPF Compiler Collection (BCC) @@ -71,7 +71,7 @@ Standalone tool to run BCC tracers written in Lua %package tools Summary: Command line tools for BPF Compiler Collection (BCC) -Requires: python3-bpfcc = %{version}-%{release} +Requires: python3-bcc = %{version}-%{release} Requires: python3-netaddr Requires: kernel-devel @@ -99,18 +99,12 @@ Command line tools for BPF Compiler Collection (BCC) find %{buildroot}%{_datadir}/%{name}/{tools,examples} -type f -exec \ sed -i -e '1s=^#!/usr/bin/python\([0-9.]\+\)\?$=#!%{__python3}=' \ -e '1s=^#!/usr/bin/env python\([0-9.]\+\)\?$=#!%{__python3}=' \ - -e 's/from bcc/from bpfcc/g' \ - -e 's/import bcc/import bpfcc/g' \ - -e 's/bcc\./bpfcc\./g' \ -e '1s=^#!/usr/bin/env bcc-lua$=#!/usr/bin/bcc-lua=' {} \; # Move man pages to the right location mkdir -p %{buildroot}%{_mandir} mv %{buildroot}%{_datadir}/%{name}/man/* %{buildroot}%{_mandir}/ -mv %{buildroot}%{python3_sitelib}/%{name} %{buildroot}%{python3_sitelib}/bpfcc -rename %{name} bpfcc %{buildroot}%{python3_sitelib}/%{name}-*egg-info - # Avoid conflict with other manpages # https://bugzilla.redhat.com/show_bug.cgi?id=1517408 for i in `find %{buildroot}%{_mandir} -name "*.gz"`; do @@ -143,8 +137,8 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %{_libdir}/pkgconfig/lib%{name}.pc %{_includedir}/%{name}/ -%files -n python3-bpfcc -%{python3_sitelib}/bpfcc* +%files -n python3-bcc +%{python3_sitelib}/bcc* %files help %dir %{_docdir}/%{name} @@ -161,6 +155,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %changelog +* Tue Jan 10 2023 yangchenguang - 0.23.0-3 +- Fix bcc-tools used from bcc not bpfcc + * Tue Oct 25 2022 liuchao - 0.23.0-2 - remove cpuload