revert to bcc 0.13 and rename python3-bcc to python3-bpfcc

This commit is contained in:
Shinwell Hu 2020-07-17 12:50:50 +00:00
parent 10b23542d6
commit 34e6e73244
3 changed files with 16 additions and 11 deletions

BIN
bcc-0.13.0.tar.gz Normal file

Binary file not shown.

View File

@ -1 +0,0 @@
404: Not Found

View File

@ -1,6 +1,6 @@
Name: bcc Name: bcc
Version: 0.14.0 Version: 0.13.0
Release: 0 Release: 2
Summary: BPF Compiler Collection (BCC) Summary: BPF Compiler Collection (BCC)
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/iovisor/bcc URL: https://github.com/iovisor/bcc
@ -14,6 +14,8 @@ BuildRequires: bison cmake >= 2.8.7 flex libxml2-devel python3-devel
BuildRequires: elfutils-libelf-devel llvm-devel clang-devel BuildRequires: elfutils-libelf-devel llvm-devel clang-devel
BuildRequires: llvm-static ncurses-devel pkgconfig(luajit) BuildRequires: llvm-static ncurses-devel pkgconfig(luajit)
BuildRequires: libbpf-devel >= 0.0.5-3, libbpf-static >= 0.0.5-3 BuildRequires: libbpf-devel >= 0.0.5-3, libbpf-static >= 0.0.5-3
# Additional dependency on util-linux for 'rename'
BuildRequires: util-linux
Requires: %{name}-tools = %{version}-%{release} Requires: %{name}-tools = %{version}-%{release}
Requires: libbpf >= 0.0.5-3 Requires: libbpf >= 0.0.5-3
@ -48,13 +50,13 @@ BuildArch: noarch
Examples for BPF Compiler Collection (BCC) Examples for BPF Compiler Collection (BCC)
%package -n python3-%{name} %package -n python3-bpfcc
Summary: Python3 bindings for BPF Compiler Collection (BCC) Summary: Python3 bindings for BPF Compiler Collection (BCC)
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
%{?python_provide:%python_provide python3-%{srcname}} %{?python_provide:%python_provide python3-bpfcc}
%description -n python3-%{name} %description -n python3-bpfcc
Python3 bindings for BPF Compiler Collection (BCC) Python3 bindings for BPF Compiler Collection (BCC)
@ -67,7 +69,7 @@ Standalone tool to run BCC tracers written in Lua
%package tools %package tools
Summary: Command line tools for BPF Compiler Collection (BCC) Summary: Command line tools for BPF Compiler Collection (BCC)
Requires: python3-%{name} = %{version}-%{release} Requires: python3-bpfcc = %{version}-%{release}
Requires: python3-netaddr Requires: python3-netaddr
Requires: kernel-devel Requires: kernel-devel
@ -100,6 +102,10 @@ find %{buildroot}%{_datadir}/%{name}/{tools,examples} -type f -exec \
# Move man pages to the right location # Move man pages to the right location
mkdir -p %{buildroot}%{_mandir} mkdir -p %{buildroot}%{_mandir}
mv %{buildroot}%{_datadir}/%{name}/man/* %{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 # Avoid conflict with other manpages
# https://bugzilla.redhat.com/show_bug.cgi?id=1517408 # https://bugzilla.redhat.com/show_bug.cgi?id=1517408
for i in `find %{buildroot}%{_mandir} -name "*.gz"`; do for i in `find %{buildroot}%{_mandir} -name "*.gz"`; do
@ -134,8 +140,8 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/
%{_libdir}/pkgconfig/lib%{name}.pc %{_libdir}/pkgconfig/lib%{name}.pc
%{_includedir}/%{name}/ %{_includedir}/%{name}/
%files -n python3-%{name} %files -n python3-bpfcc
%{python3_sitelib}/%{name}* %{python3_sitelib}/bpfcc*
%files help %files help
%dir %{_docdir}/%{name} %dir %{_docdir}/%{name}
@ -152,8 +158,8 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/
%changelog %changelog
* Wed Jun 03 2020 SimpleUpdate Robot <tc@openeuler.org> * Fri Jul 17 2020 Shinwell Hu <micromotive@qq.com> - 0.13.0-2
- Update to version 0.14.0 - Rename python3-bcc to python3-bpfcc to avoid confliction with bcc on pypi
* Sun Apr 26 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.13.0-1 * Sun Apr 26 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.13.0-1
- Package init - Package init