From 7d0dc7330b057f63c6044b5e0c4b5e360adec31b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 8 Dec 2024 21:02:13 +0100 Subject: [PATCH] Relax chrono-tz dependency to allow building with 0.9 and 0.10 --- jiff-fix-metadata-auto.diff | 2 +- jiff-fix-metadata.diff | 11 ++++++++++- rust-jiff.spec | 1 + rust2rpm.toml | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/jiff-fix-metadata-auto.diff b/jiff-fix-metadata-auto.diff index 58b0dc2..ef95507 100644 --- a/jiff-fix-metadata-auto.diff +++ b/jiff-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- jiff-0.1.15/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ jiff-0.1.15/Cargo.toml 2024-11-30T23:16:22.594085+00:00 ++++ jiff-0.1.15/Cargo.toml 2024-12-08T19:53:18.958265+00:00 @@ -131,46 +131,22 @@ "tzdb-zoneinfo", ] diff --git a/jiff-fix-metadata.diff b/jiff-fix-metadata.diff index 1f659cb..e2bc734 100644 --- a/jiff-fix-metadata.diff +++ b/jiff-fix-metadata.diff @@ -1,5 +1,14 @@ --- jiff-0.1.15/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ jiff-0.1.15/Cargo.toml 2024-11-30T23:16:38.372314+00:00 ++++ jiff-0.1.15/Cargo.toml 2024-12-08T19:53:29.866324+00:00 +@@ -85,7 +85,7 @@ + features = ["serde"] + + [dev-dependencies.chrono-tz] +-version = "0.9.0" ++version = ">=0.9,<0.11" + + [dev-dependencies.icu] + version = "1.5.0" @@ -147,6 +147,3 @@ ] tzdb-zoneinfo = ["std"] diff --git a/rust-jiff.spec b/rust-jiff.spec index 133f134..cde1de0 100644 --- a/rust-jiff.spec +++ b/rust-jiff.spec @@ -16,6 +16,7 @@ Source: %{crates_source} Patch: jiff-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * Drop dev-dependency hifitime: not packaged, and only for doctests +# * Relax chrono-tz dependency to allow building with 0.9 and 0.10 Patch: jiff-fix-metadata.diff # * Downstream-only: Omit doctests that require hifitime. It is not worth # packaging it solely for a couple of tiny examples. diff --git a/rust2rpm.toml b/rust2rpm.toml index 13311f5..80541e3 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -19,6 +19,7 @@ cargo-toml-patch-comments = [ # an unconditional dependency, but given it is # target.'cfg(not(target_family = "wasm"))', manual patching is easier. "Drop dev-dependency hifitime: not packaged, and only for doctests", + "Relax chrono-tz dependency to allow building with 0.9 and 0.10", ] [[package.extra-patches]]