From eea2e2c78a97c51a68217e5ee6881050900c27bc Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 22 Nov 2024 23:35:20 -0500 Subject: [PATCH] Update to 0.1.5 (close RHBZ#2328450) --- .gitignore | 1 + rust-zerofrom-derive.spec | 6 +++++- rust2rpm.toml | 8 ++++++++ sources | 2 +- zerofrom-derive-fix-metadata.diff | 13 +++++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 zerofrom-derive-fix-metadata.diff diff --git a/.gitignore b/.gitignore index f64a366..e789698 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zerofrom-derive-0.1.4.crate +/zerofrom-derive-0.1.5.crate diff --git a/rust-zerofrom-derive.spec b/rust-zerofrom-derive.spec index b03025c..80e1087 100644 --- a/rust-zerofrom-derive.spec +++ b/rust-zerofrom-derive.spec @@ -5,13 +5,17 @@ %global crate zerofrom-derive Name: rust-zerofrom-derive -Version: 0.1.4 +Version: 0.1.5 Release: %autorelease Summary: Custom derive for the zerofrom crate License: Unicode-3.0 URL: https://crates.io/crates/zerofrom-derive Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * Patch out the "zf_derive" example to avoid a circular dependency on the +# zerofrom crate. +Patch: zerofrom-derive-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 diff --git a/rust2rpm.toml b/rust2rpm.toml index ec432ac..d1c351e 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -1,3 +1,11 @@ +[package] +cargo-toml-patch-comments = [ + """\ + Patch out the \"zf_derive\" example to avoid a circular dependency on the \ + zerofrom crate.\ + """, +] + [scripts.prep] pre = [ "# Avoid a circular dependency on the zerofrom crate", diff --git a/sources b/sources index 11ea084..6bcda75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zerofrom-derive-0.1.4.crate) = f2ea4650fcb4e7c3583f0f7c6146c7734cf6e80e07d92c330c6bc6a0a4e0fe14ae3393845713331240c70685e92eec114565c5be21189e687fe6232aef75a9c0 +SHA512 (zerofrom-derive-0.1.5.crate) = 75098e0f1c690bd8476f819f4ea2a7645b88237042a8876259bf4e025b070a4b105caf16ca7a824c5dd6c4690b693fcc74bed9ac0b5e6fdab05a5bed1b5cb298 diff --git a/zerofrom-derive-fix-metadata.diff b/zerofrom-derive-fix-metadata.diff new file mode 100644 index 0000000..f5a2cdf --- /dev/null +++ b/zerofrom-derive-fix-metadata.diff @@ -0,0 +1,13 @@ +--- zerofrom-derive-0.1.5/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zerofrom-derive-0.1.5/Cargo.toml 2024-11-23T04:34:46.819876+00:00 +@@ -44,10 +44,6 @@ + path = "src/lib.rs" + proc-macro = true + +-[[example]] +-name = "zf_derive" +-path = "examples/zf_derive.rs" +- + [dependencies.proc-macro2] + version = "1.0.61" +