From f88de61b501fc648cf2f351760410fb0e067743a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 26 Nov 2024 21:07:18 +0100 Subject: [PATCH] Update to version 1.0.92; Fixes RHBZ#2327752 --- .gitignore | 1 + proc-macro2-fix-metadata.diff | 4 ++-- rust-proc-macro2.spec | 13 +++++++------ rust2rpm.toml | 15 +++++++++++---- sources | 2 +- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index abd9377..aeda367 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ /proc-macro2-1.0.87.crate /proc-macro2-1.0.88.crate /proc-macro2-1.0.89.crate +/proc-macro2-1.0.92.crate diff --git a/proc-macro2-fix-metadata.diff b/proc-macro2-fix-metadata.diff index db0b3a2..7e04486 100644 --- a/proc-macro2-fix-metadata.diff +++ b/proc-macro2-fix-metadata.diff @@ -1,5 +1,5 @@ ---- proc-macro2-1.0.89/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ proc-macro2-1.0.89/Cargo.toml 2024-11-06T21:29:30.610245+00:00 +--- proc-macro2-1.0.92/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ proc-macro2-1.0.92/Cargo.toml 2024-11-26T20:05:37.694162+00:00 @@ -82,21 +82,12 @@ [dependencies.unicode-ident] version = "1.0" diff --git a/rust-proc-macro2.spec b/rust-proc-macro2.spec index ba8ee75..7aa4bc0 100644 --- a/rust-proc-macro2.spec +++ b/rust-proc-macro2.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 26 -%bcond_without check +# Generated by rust2rpm 27 +%bcond check 1 %global debug_package %{nil} %global crate proc-macro2 Name: rust-proc-macro2 -Version: 1.0.89 +Version: 1.0.92 Release: %autorelease Summary: Substitute implementation of the Rust compiler's proc_macro API @@ -15,7 +15,7 @@ Source: %{crates_source} # Manually created patch for downstream crate metadata changes # * remove superfluous dev-dependencies that are only present for a noop doctest Patch: proc-macro2-fix-metadata.diff -Patch: 0001-ignore-one-doctest-block-that-adds-superfluous-dev-d.patch +Patch2: 0001-ignore-one-doctest-block-that-adds-superfluous-dev-d.patch BuildRequires: cargo-rpm-macros >= 24 @@ -91,9 +91,10 @@ use the "span-locations" feature of the "%{crate}" crate. %if %{with check} %check -# * skip a test that harmlessly fails on 32-bit architectures +%cargo_test -- --lib # * skip doctests that don't compile -%cargo_test -- -- --skip test_proc_macro2_wrapper_size_without_locations --skip 'src/lib.rs' +%cargo_test -- --doc -- --skip 'src/lib.rs' +%cargo_test -- --tests %endif %changelog diff --git a/rust2rpm.toml b/rust2rpm.toml index 32661ea..3b924ca 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -4,16 +4,23 @@ cargo-toml-patch-comments = [ "remove superfluous dev-dependencies that are only present for a noop doctest", ] +[[package.extra-patches]] +number = 2 +file = "0001-ignore-one-doctest-block-that-adds-superfluous-dev-d.patch" + [features] hide = ["nightly"] [tests] -skip = [ - "test_proc_macro2_wrapper_size_without_locations", +run = [ + "lib", + "doc", + "tests", +] +skip.doc = [ "'src/lib.rs'", ] -comments = [ - "skip a test that harmlessly fails on 32-bit architectures", +comments.doc = [ "skip doctests that don't compile", ] diff --git a/sources b/sources index 2dad9b1..638855f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (proc-macro2-1.0.89.crate) = 488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f +SHA512 (proc-macro2-1.0.92.crate) = e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee