From 1be993a4d7f7a47b2eeb591150bb24abe7b340f6 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mon, 2 Mar 2020 14:54:06 +0100 Subject: [PATCH] Update to 0.4.11 Signed-off-by: Igor Raits --- .gitignore | 1 + ...-build.rs-Simplify-check-for-version.patch | 36 ------------------- proc-macro-error-fix-metadata.diff | 4 +-- rust-proc-macro-error.spec | 7 ++-- sources | 2 +- 5 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 0001-build.rs-Simplify-check-for-version.patch diff --git a/.gitignore b/.gitignore index 248c98f..e9753f0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /proc-macro-error-0.4.8.crate /proc-macro-error-0.4.9.crate /proc-macro-error-0.4.10.crate +/proc-macro-error-0.4.11.crate diff --git a/0001-build.rs-Simplify-check-for-version.patch b/0001-build.rs-Simplify-check-for-version.patch deleted file mode 100644 index f23ec69..0000000 --- a/0001-build.rs-Simplify-check-for-version.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e7626a25471d2db29e7cdee81308ee4604b41544 Mon Sep 17 00:00:00 2001 -From: Igor Raits -Date: Mon, 2 Mar 2020 12:14:11 +0100 -Subject: [PATCH] build.rs: Simplify check for version - -This also fixes build with rustc shipped by distributions. - -Fixes: https://gitlab.com/CreepySkeleton/proc-macro-error/issues/8 -Signed-off-by: Igor Raits ---- - build.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/build.rs b/build.rs -index 17cf408..3c1196f 100644 ---- a/build.rs -+++ b/build.rs -@@ -1,11 +1,11 @@ - fn main() { -- let (version, channel, _) = version_check::triple().unwrap(); -- -- if !channel.is_nightly() { -+ if !version_check::is_feature_flaggable().unwrap_or(false) { - println!("cargo:rustc-cfg=use_fallback"); - } - -- if version.at_most("1.38.0") || !channel.is_stable() { -+ if version_check::is_max_version("1.38.0").unwrap_or(false) -+ || !version_check::Channel::read().unwrap().is_stable() -+ { - println!("cargo:rustc-cfg=skip_ui_tests"); - } - } --- -2.25.1 - diff --git a/proc-macro-error-fix-metadata.diff b/proc-macro-error-fix-metadata.diff index 201d467..a927f27 100644 --- a/proc-macro-error-fix-metadata.diff +++ b/proc-macro-error-fix-metadata.diff @@ -1,5 +1,5 @@ ---- proc-macro-error-0.4.10/Cargo.toml 2020-02-29T15:59:26+00:00 -+++ proc-macro-error-0.4.10/Cargo.toml 2020-03-02T08:06:31.398597+00:00 +--- proc-macro-error-0.4.11/Cargo.toml 2020-03-02T13:26:24+00:00 ++++ proc-macro-error-0.4.11/Cargo.toml 2020-03-02T13:53:33.669480+00:00 @@ -36,7 +36,7 @@ features = ["derive", "parsing", "proc-macro", "printing"] default-features = false diff --git a/rust-proc-macro-error.spec b/rust-proc-macro-error.spec index 23096c2..ac1855c 100644 --- a/rust-proc-macro-error.spec +++ b/rust-proc-macro-error.spec @@ -6,7 +6,7 @@ %global crate proc-macro-error Name: rust-%{crate} -Version: 0.4.10 +Version: 0.4.11 Release: 1%{?dist} Summary: Almost drop-in replacement to panics in proc-macros @@ -17,8 +17,6 @@ Source: %{crates_source} # Initial patched metadata # * unpin the toml dependency Patch0: proc-macro-error-fix-metadata.diff -# https://gitlab.com/CreepySkeleton/proc-macro-error/-/merge_requests/25 -Patch0001: 0001-build.rs-Simplify-check-for-version.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -77,6 +75,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Mon Mar 02 14:53:33 CET 2020 Igor Raits - 0.4.11-1 +- Update to 0.4.11 + * Mon Mar 02 09:06:31 CET 2020 Igor Raits - 0.4.10-1 - Update to 0.4.10 diff --git a/sources b/sources index 0a73a54..eaebd86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (proc-macro-error-0.4.10.crate) = a11ede5e08c62cefbbb7b1c7894593e923688ba10b1ff46907f8e34f69e3cd86f940604f0419206471991c4e70ba5c32e37ce41d1b0ab8b26b90a7f06a39c0e8 +SHA512 (proc-macro-error-0.4.11.crate) = 8d6098bcb1b61bf6894feb10a447afb71f9862f83a0c00b2eee9b0443c77d9ad7e17f848d760c158f1070d3e6716e4490f1c31199800d72939749d71051681c6