From a9bb9e277f76be71ebf4a1c4e0c38edbc5d15940 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Thu, 4 Jan 2024 20:18:48 -0600 Subject: [PATCH] Update to 0.16.0 Signed-off-by: Michel Lind --- .gitignore | 1 + procfs-fix-metadata.diff | 11 ----------- rust-procfs.spec | 22 +++++++++++++--------- rust2rpm.toml | 3 +++ sources | 2 +- 5 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 procfs-fix-metadata.diff create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index a421ca1..f0a0f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /procfs-0.12.0.crate /procfs-0.14.2.crate /procfs-0.15.1.crate +/procfs-0.16.0.crate diff --git a/procfs-fix-metadata.diff b/procfs-fix-metadata.diff deleted file mode 100644 index 39eec6e..0000000 --- a/procfs-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- procfs-0.15.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ procfs-0.15.1/Cargo.toml 2023-05-20T20:25:05.737487+00:00 -@@ -66,7 +66,7 @@ - version = "1.0.2" - - [dependencies.rustix] --version = "0.36.0" -+version = "0.37.0" - features = [ - "fs", - "process", diff --git a/rust-procfs.spec b/rust-procfs.spec index bc4b2fe..07adafd 100644 --- a/rust-procfs.spec +++ b/rust-procfs.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 # * missing dev-dependency: procinfo (depends on outdated nom 2) %bcond_with check %global debug_package %{nil} @@ -6,18 +6,20 @@ %global crate procfs Name: rust-procfs -Version: 0.15.1 +Version: 0.16.0 Release: %autorelease Summary: Interface to the linux procfs pseudo-filesystem License: MIT OR Apache-2.0 URL: https://crates.io/crates/procfs Source: %{crates_source} -# Manually created patch for downstream crate metadata changes -# * bump rustix from 0.36 to 0.37 -Patch: procfs-fix-metadata.diff +# missing license texts after split into two crates: +# https://github.com/eminence/procfs/pull/297 +Source: https://raw.githubusercontent.com/eminence/procfs/master/COPYRIGHT.txt +Source: https://raw.githubusercontent.com/eminence/procfs/master/LICENSE-APACHE +Source: https://raw.githubusercontent.com/eminence/procfs/master/LICENSE-MIT -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Interface to the linux procfs pseudo-filesystem.} @@ -38,8 +40,6 @@ use the "%{crate}" crate. %license %{crate_instdir}/LICENSE-APACHE %license %{crate_instdir}/LICENSE-MIT %doc %{crate_instdir}/README.md -%doc %{crate_instdir}/msrv.md -%doc %{crate_instdir}/support.md %{crate_instdir}/ %package -n %{name}+default-devel @@ -115,7 +115,11 @@ use the "serde1" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 +# copy in license files +cp -p %{SOURCE1} . +cp -p %{SOURCE2} . +cp -p %{SOURCE3} . %cargo_prep %generate_buildrequires diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..77b7131 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,3 @@ +[tests] +comments = ["missing dev-dependency: procinfo (depends on outdated nom 2)"] +run = ["none"] diff --git a/sources b/sources index 5a1004a..21b3fcd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (procfs-0.15.1.crate) = 8ccd80a027deb759798d055e21ae56f346e3cb869af40de23970f7237100f46087b3c3f1908900ce558b92bf5d341421a1b717cfacdcdd6d38b256255f15ac82 +SHA512 (procfs-0.16.0.crate) = bcc08d05a536f34272a0beae3e0fa55360de1aab6942d3b20e95a577bcaa4def8f5ecc96e9432871efb13a8d298b2b0fe61c7188c9d2ee5deed2544371aab707