diff --git a/bcc.spec b/bcc.spec index c8f30e8667a72220e9dbe789699e5416e0821aaf..319453ed16e6d61d0e4bca5714a50a78974a6014 100644 --- a/bcc.spec +++ b/bcc.spec @@ -2,9 +2,9 @@ Name: bcc Version: 0.29.1 -Release: 3 +Release: 4 Summary: BPF Compiler Collection (BCC) -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/iovisor/bcc # Upstream now provides a release with the git submodule embedded in it Source0: %{url}/releases/download/v%{version}/%{name}-src-with-submodule.tar.gz @@ -87,17 +87,19 @@ Command line tools for BPF Compiler Collection (BCC) %autosetup -n %{name} -p1 %build -%cmake . \ +%cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DREVISION_LAST=%{version} -DREVISION=%{version} -DPYTHON_CMD=python3 \ -DCMAKE_USE_LIBBPF_PACKAGE:BOOL=FALSE \ %{?with_llvm_shared:-DENABLE_LLVM_SHARED=1} -%make_build +%cmake_build %install -%make_install +%cmake_install + +rm -f %{buildroot}%{_libdir}/*.a # Fix python shebangs find %{buildroot}%{_datadir}/%{name}/{tools,examples} -type f -exec \ @@ -131,8 +133,6 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ # the machine (e.g, IP address) #%check -%ldconfig_scriptlets - %files %doc README.md %license LICENSE.txt @@ -140,8 +140,6 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %{_libdir}/libbcc_bpf.so.* %files devel -%exclude %{_libdir}/lib%{name}*.a -%exclude %{_libdir}/lib%{name}*.la %{_libdir}/lib%{name}.so %{_libdir}/libbcc_bpf.so %{_libdir}/pkgconfig/lib%{name}.pc @@ -165,6 +163,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/tools/old/ %changelog +* Fri Dec 20 2024 Funda Wang - 0.29.1-4 +- adopt to new cmake macro + * Tue Dec 03 2024 zhangmingyi - 0.29.1-3 - backport and sync patches