diff --git a/.gitignore b/.gitignore index e0e3a42..e53030e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /proc-macro-crate-1.2.0.crate /proc-macro-crate-1.2.1.crate /proc-macro-crate-1.3.1.crate +/proc-macro-crate-2.0.1.crate diff --git a/proc-macro-crate-fix-metadata.diff b/proc-macro-crate-fix-metadata.diff new file mode 100644 index 0000000..3571667 --- /dev/null +++ b/proc-macro-crate-fix-metadata.diff @@ -0,0 +1,15 @@ +--- proc-macro-crate-2.0.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ proc-macro-crate-2.0.1/Cargo.toml 2024-01-12T15:39:33.968832+00:00 +@@ -31,10 +31,10 @@ + repository = "https://github.com/bkchr/proc-macro-crate" + + [dependencies.toml_datetime] +-version = "=0.6.3" ++version = "0.6.3" + + [dependencies.toml_edit] +-version = "=0.20.2" ++version = "0.20.2" + + [dev-dependencies.proc-macro2] + version = "1.0.67" diff --git a/rust-proc-macro-crate.spec b/rust-proc-macro-crate.spec index d1a5d80..d577eed 100644 --- a/rust-proc-macro-crate.spec +++ b/rust-proc-macro-crate.spec @@ -1,19 +1,22 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate proc-macro-crate Name: rust-proc-macro-crate -Version: 1.3.1 +Version: 2.0.1 Release: %autorelease Summary: Replacement for crate (macro_rules keyword) in proc-macros License: MIT OR Apache-2.0 URL: https://crates.io/crates/proc-macro-crate Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * relax exact toml_datetime and toml_edit dependencies +Patch: proc-macro-crate-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Replacement for crate (macro_rules keyword) in proc-macros.} @@ -48,7 +51,7 @@ use the "default" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -62,7 +65,8 @@ use the "default" feature of the "%{crate}" crate. %if %{with check} %check -%cargo_test +# * skip a test that can only be run in-tree +%cargo_test -- -- --exact --skip workspace_deps_working %endif %changelog diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..ca0439f --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,5 @@ +[tests] +skip = ["workspace_deps_working"] +skip-exact = true +comments = ["skip a test that can only be run in-tree"] + diff --git a/sources b/sources index cf65154..ee3b865 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (proc-macro-crate-1.3.1.crate) = 5306f017933ffa89eb6111ee00b0536179c5cfab56529440630a0bec86b62194ff16f57ebb471b233e88cd886b7b9871de8402ed29073b23e5ca98193e513659 +SHA512 (proc-macro-crate-2.0.1.crate) = 4a914dad5b558b9baf7ba9ca28c154cd14c97c85c094ebb412f6f80ecd4331de7d899c020f0facee788926acc22e0fe229e00d549b84b062aab470237dedf63e