From 8a3607452c9c3307a89cf30e1bdc7d5a2d405aeb Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 18 Oct 2023 21:32:35 +0200 Subject: [PATCH] Update to version 3.2.1; Fixes RHBZ#2057213 --- .gitignore | 1 + rust-test-case.spec | 9 +++---- rust2rpm.toml | 2 ++ sources | 2 +- test-case-fix-metadata.diff | 50 ++++++------------------------------- 5 files changed, 16 insertions(+), 48 deletions(-) create mode 100644 rust2rpm.toml diff --git a/.gitignore b/.gitignore index adce950..063f87a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /test-case-1.2.0.crate /test-case-1.2.1.crate /test-case-2.2.2.crate +/test-case-3.2.1.crate diff --git a/rust-test-case.spec b/rust-test-case.spec index 44b6f19..f78c7ba 100644 --- a/rust-test-case.spec +++ b/rust-test-case.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate test-case Name: rust-test-case -Version: 2.2.2 +Version: 3.2.1 Release: %autorelease Summary: Procedural macro attribute for generating parametrized test cases @@ -15,10 +15,9 @@ Source: %{crates_source} # Manually created patch for downstream crate metadata changes # * drop acceptance tests that are not included in published crates # * exclude some files that are only useful for upstream development -# * relax version restrictions on dev-dependencies Patch: test-case-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Provides #[test_case(...)] procedural macro attribute for generating @@ -78,7 +77,7 @@ use the "with-regex" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 # integration tests rely on files that are not included in published crates rm tests/acceptance_tests.rs %cargo_prep diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..a687c24 --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,2 @@ +[package] +summary = "Procedural macro attribute for generating parametrized test cases" diff --git a/sources b/sources index 15ff4bf..b1fd323 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (test-case-2.2.2.crate) = 505a417877f5e94e79ae14cce7ad003e1d10873d25fe71296110b6ad971a8f604cb5bea69109f0ddf641f7ca7ffb40203bb491b29d3d5e656c66f46dff470f41 +SHA512 (test-case-3.2.1.crate) = 60724384f47ed37089362c30eed7365de240c86fcd5dafe05061a29ce313fe9d91cc40a021455acc32fb4bbe7225aa81874f3e79c097fb41876e7d18cb4a2337 diff --git a/test-case-fix-metadata.diff b/test-case-fix-metadata.diff index ab845af..ac233aa 100644 --- a/test-case-fix-metadata.diff +++ b/test-case-fix-metadata.diff @@ -1,56 +1,22 @@ ---- test-case-2.2.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ test-case-2.2.2/Cargo.toml 2023-02-27T17:04:11.944205+00:00 -@@ -18,7 +18,12 @@ +--- test-case-3.2.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ test-case-3.2.1/Cargo.toml 2023-10-08T21:28:31.154495+00:00 +@@ -19,7 +19,7 @@ "Wojciech Polak ", "Ɓukasz Biel ", ] -exclude = ["tests/snapshots/**/*"] -+exclude = [ -+ "/ci", -+ "/publish.sh", -+ "README.tpl", -+ "tests/snapshots/**/*", -+] ++exclude = ["tests/snapshots/**/*", "/scripts", "README.tpl"] description = "Provides #[test_case(...)] procedural macro attribute for generating parametrized test cases easily" documentation = "https://docs.rs/test-case" readme = "README.md" -@@ -40,10 +45,6 @@ +@@ -40,10 +40,6 @@ + [lib] path = "src/lib.rs" doctest = false - +- -[[test]] -name = "acceptance" -path = "tests/acceptance_tests.rs" -- - [dependencies.regex] - version = "1.5" - optional = true -@@ -53,7 +54,7 @@ - default-features = false - - [dev-dependencies.indexmap] --version = "=1.8.2" -+version = "1.8.2" - [dev-dependencies.insta] - version = "1.12" -@@ -62,16 +63,16 @@ - version = "0.10" - - [dev-dependencies.linked-hash-map] --version = "=0.5.4" -+version = "0.5.4" - - [dev-dependencies.once_cell] --version = "=1.13.0" -+version = "1.13.0" - - [dev-dependencies.regex] + [dependencies.regex] version = "1.5" - - [dev-dependencies.serde_yaml] --version = "=0.8.25" -+version = "0.8.25" - - [features] - with-regex = [