diff --git a/libbpf-cargo-fix-metadata.diff b/libbpf-cargo-fix-metadata.diff new file mode 100644 index 0000000..4e6d6aa --- /dev/null +++ b/libbpf-cargo-fix-metadata.diff @@ -0,0 +1,17 @@ +--- libbpf-cargo-0.21.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libbpf-cargo-0.21.2/Cargo.toml 2023-12-29T20:36:11.240361+00:00 +@@ -30,12 +30,10 @@ + license = "LGPL-2.1-only OR BSD-2-Clause" + repository = "https://github.com/libbpf/libbpf-rs" + ++autobins = false ++ + [lib] + path = "src/lib.rs" +- +-[[bin]] +-name = "cargo-libbpf" +-path = "src/main.rs" + + [dependencies.anyhow] + version = "1.0.1" diff --git a/rust-libbpf-cargo0.21.spec b/rust-libbpf-cargo0.21.spec index 3458c30..9e09802 100644 --- a/rust-libbpf-cargo0.21.spec +++ b/rust-libbpf-cargo0.21.spec @@ -1,5 +1,6 @@ # Generated by rust2rpm 25 %bcond_without check +%global debug_package %{nil} %global crate libbpf-cargo @@ -11,6 +12,9 @@ Summary: Cargo plugin to build bpf programs License: LGPL-2.1-only OR BSD-2-Clause URL: https://crates.io/crates/libbpf-cargo Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * disable bin - compat crate +Patch: libbpf-cargo-fix-metadata.diff # by default, test.rs expects libbpf-rs to be in the same checkout # fix to point to /usr/share/cargo/registry Patch: libbpf-cargo-fix-finding-libbpf-rs.diff @@ -22,31 +26,6 @@ Cargo plugin to build bpf programs.} %description %{_description} -%package -n %{crate} -Summary: %{summary} -# (MIT OR Apache-2.0) AND Unicode-DFS-2016 -# Apache-2.0 OR BSL-1.0 -# Apache-2.0 OR MIT -# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT -# BSD-2-Clause -# BSD-3-Clause OR MIT OR Apache-2.0 -# LGPL-2.1-only OR BSD-2-Clause -# MIT -# MIT OR Apache-2.0 -License: (LGPL-2.1-only OR BSD-2-Clause) AND ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-3-Clause OR MIT OR Apache-2.0) AND MIT -# LICENSE.dependencies contains a full license breakdown - -%description -n %{crate} %{_description} - -%files -n %{crate} -%license LICENSE -%license LICENSE.BSD-2-Clause -%license LICENSE.LGPL-2.1 -%license LICENSE.dependencies -%doc CHANGELOG.md -%doc README.md -%{_bindir}/cargo-libbpf - %package devel Summary: %{summary} BuildArch: noarch @@ -101,8 +80,6 @@ echo 'rustfmt' %build %cargo_build -%{cargo_license_summary} -%{cargo_license} > LICENSE.dependencies %install %cargo_install