From a975ef2b190ce741af6af3128f207c56c8d35bd4 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 10 Feb 2022 15:46:30 -0800 Subject: [PATCH] Update to 0.6.1~2 (resolves: rhbz#2028922) Signed-off-by: Michel Alexandre Salim --- .gitignore | 6 +----- .rust2rpm.conf | 11 +++++++++++ libbpf-sys-fix-metadata.diff | 4 ++-- rust-libbpf-sys.spec | 29 +++++++++++++---------------- sources | 2 +- 5 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 .rust2rpm.conf diff --git a/.gitignore b/.gitignore index 0d3a4d2..a837eee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/libbpf-sys-0.3.0-2.crate -/libbpf-sys-0.4.0-1.crate -/libbpf-sys-0.4.0-2.crate -/libbpf-sys-0.5.0-1.crate -/libbpf-sys-0.5.0-2.crate +/libbpf-sys-0.6.1-2.crate diff --git a/.rust2rpm.conf b/.rust2rpm.conf new file mode 100644 index 0000000..83ba2b0 --- /dev/null +++ b/.rust2rpm.conf @@ -0,0 +1,11 @@ +[DEFAULT] +buildrequires = + elfutils-libelf-devel + kernel-headers + libbpf-devel + zlib-devel +lib.requires = + elfutils-libelf-devel + kernel-headers + libbpf-devel + zlib-devel diff --git a/libbpf-sys-fix-metadata.diff b/libbpf-sys-fix-metadata.diff index 276be27..2f61d64 100644 --- a/libbpf-sys-fix-metadata.diff +++ b/libbpf-sys-fix-metadata.diff @@ -1,5 +1,5 @@ ---- libbpf-sys-0.5.0-2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libbpf-sys-0.5.0-2/Cargo.toml 2021-11-11T15:18:57.236959+00:00 +--- libbpf-sys-0.6.1-2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libbpf-sys-0.6.1-2/Cargo.toml 2022-02-10T23:20:20.526559+00:00 @@ -32,6 +32,7 @@ version = "0.3" diff --git a/rust-libbpf-sys.spec b/rust-libbpf-sys.spec index 1dc2df2..0a3ad25 100644 --- a/rust-libbpf-sys.spec +++ b/rust-libbpf-sys.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 %bcond_without check %global debug_package %{nil} %global crate libbpf-sys Name: rust-%{crate} -Version: 0.5.0~2 +Version: 0.6.1~2 Release: %autorelease Summary: Rust bindings to libbpf from the Linux kernel @@ -17,15 +17,8 @@ Source: %{crates_source} Patch0: libbpf-sys-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging -BuildRequires: kernel-headers -BuildRequires: elfutils-libelf-devel -BuildRequires: libbpf-devel -BuildRequires: zlib-devel %global _description %{expand: Rust bindings to libbpf from the Linux kernel.} @@ -35,15 +28,15 @@ Rust bindings to libbpf from the Linux kernel.} %package devel Summary: %{summary} BuildArch: noarch -Requires: kernel-headers Requires: elfutils-libelf-devel +Requires: kernel-headers Requires: libbpf-devel Requires: zlib-devel %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel %license LICENSE @@ -56,8 +49,8 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -68,8 +61,8 @@ BuildArch: noarch %description -n %{name}+novendor-devel %{_description} -This package contains library source intended for building other packages -which use "novendor" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "novendor" feature of the "%{crate}" crate. %files -n %{name}+novendor-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -82,6 +75,10 @@ rm -r libbpf %generate_buildrequires %cargo_generate_buildrequires +echo 'elfutils-libelf-devel' +echo 'kernel-headers' +echo 'libbpf-devel' +echo 'zlib-devel' %build %cargo_build diff --git a/sources b/sources index 7962da4..ed94907 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libbpf-sys-0.5.0-2.crate) = 24febe774e35ca486d1fa6b280cb904615275b07ab3e1d6ff38bfbabe7b90659b6d5efa22dbd3f45af0f6211ba68c81ab160ff463b65b049dbf0ba3077b4d4b7 +SHA512 (libbpf-sys-0.6.1-2.crate) = ce5bc7341d576181ae4350c5516bb3d9d3f611e673ee6586c876380b62389007d0b9f225bc94f20550b4b96ae108ee281197cb9db67737e1432417aee6f0e809