From 9f30f86b26d0171adf6de3d48a6b3f9e69e930b3 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 31 Dec 2024 12:04:16 -0500 Subject: [PATCH] Update to 0.1.17 (close RHBZ#2335070) --- .gitignore | 1 + ...ly-omit-tests-that-require-serde_yml.patch | 18 +++++++------- 173.patch | 22 ----------------- jiff-fix-metadata-auto.diff | 24 +++++++++++++++---- jiff-fix-metadata.diff | 8 +++---- rust-jiff.spec | 4 +--- rust2rpm.toml | 7 ------ sources | 2 +- 8 files changed, 36 insertions(+), 50 deletions(-) delete mode 100644 173.patch diff --git a/.gitignore b/.gitignore index eb7f62f..47471ab 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /jiff-0.1.14.crate /jiff-0.1.15.crate /jiff-0.1.16.crate +/jiff-0.1.17.crate diff --git a/0001-Downstream-only-omit-tests-that-require-serde_yml.patch b/0001-Downstream-only-omit-tests-that-require-serde_yml.patch index 00a7725..4a07c77 100644 --- a/0001-Downstream-only-omit-tests-that-require-serde_yml.patch +++ b/0001-Downstream-only-omit-tests-that-require-serde_yml.patch @@ -1,4 +1,4 @@ -From 684ec78f8f001e65d3778b5e8f0661d41d3c4a8a Mon Sep 17 00:00:00 2001 +From cc1d9dff0b581f8a33268b3d2495b60d2b770d4c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 26 Dec 2024 18:51:44 -0500 Subject: [PATCH] Downstream-only: omit tests that require serde_yml @@ -14,7 +14,7 @@ Subject: [PATCH] Downstream-only: omit tests that require serde_yml 7 files changed, 14 insertions(+) diff --git a/src/civil/date.rs b/src/civil/date.rs -index 1b413fe..039bc97 100644 +index 214c988..9a35c0b 100644 --- a/src/civil/date.rs +++ b/src/civil/date.rs @@ -4009,6 +4009,8 @@ mod tests { @@ -66,7 +66,7 @@ index f002d7c..8e8a42b 100644 /// /// Serde YAML used to be unable to deserialize `jiff` types, diff --git a/src/span.rs b/src/span.rs -index ebe96e5..93f8f0d 100644 +index 9a00d04..ffad9d2 100644 --- a/src/span.rs +++ b/src/span.rs @@ -6464,6 +6464,8 @@ mod tests { @@ -79,29 +79,29 @@ index ebe96e5..93f8f0d 100644 /// /// Serde YAML used to be unable to deserialize `jiff` types, diff --git a/src/timestamp.rs b/src/timestamp.rs -index 79230b4..83c366c 100644 +index 88ae03b..5cdd65b 100644 --- a/src/timestamp.rs +++ b/src/timestamp.rs -@@ -3701,6 +3701,8 @@ mod tests { +@@ -3700,6 +3700,8 @@ mod tests { } } + // Downstream-only: omit tests that require serde_yml + #[cfg(any())] - /// # `serde` deserializer compatibility test + /// A `serde` deserializer compatibility test. /// /// Serde YAML used to be unable to deserialize `jiff` types, diff --git a/src/zoned.rs b/src/zoned.rs -index 1627167..5bea022 100644 +index 70e88e7..80e9b26 100644 --- a/src/zoned.rs +++ b/src/zoned.rs -@@ -5251,6 +5251,8 @@ mod tests { +@@ -5264,6 +5264,8 @@ mod tests { } } + // Downstream-only: omit tests that require serde_yml + #[cfg(any())] - /// # `serde` deserializer compatibility test + /// A `serde` deserializer compatibility test. /// /// Serde YAML used to be unable to deserialize `jiff` types, -- diff --git a/173.patch b/173.patch deleted file mode 100644 index 8b4d8ac..0000000 --- a/173.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 692c9f7ebe20450269666cddeca75023c8a34a79 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Thu, 26 Dec 2024 16:04:32 -0500 -Subject: [PATCH] Fix a small typo in CHANGELOG.md - ---- - CHANGELOG.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CHANGELOG.md b/CHANGELOG.md -index 6281f33..e0f1c5a 100644 ---- a/CHANGELOG.md -+++ b/CHANGELOG.md -@@ -72,7 +72,7 @@ adding duration to now: 2026-02-26T19:00:57-05:00[America/New_York] - With Jiff, you should no longer need to pull in crates like - [`humantime`](https://docs.rs/humantime) and - [`humantime-serde`](https://docs.rs/humantime-serde) --to accomplished a similar task. -+to accomplish a similar task. - - While this new format doesn't support any kind of internationalization, the - prevalence of the `humantime` crate suggests there's a desire for something diff --git a/jiff-fix-metadata-auto.diff b/jiff-fix-metadata-auto.diff index 636457b..c44d607 100644 --- a/jiff-fix-metadata-auto.diff +++ b/jiff-fix-metadata-auto.diff @@ -1,6 +1,14 @@ ---- jiff-0.1.16/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ jiff-0.1.16/Cargo.toml 2024-12-27T00:19:01.399220+00:00 -@@ -142,8 +142,6 @@ +--- jiff-0.1.17/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ jiff-0.1.17/Cargo.toml 2024-12-31T17:02:33.129582+00:00 +@@ -137,7 +137,6 @@ + [features] + alloc = [ + "serde?/alloc", +- "portable-atomic-util/alloc", + ] + default = [ + "std", +@@ -146,8 +145,6 @@ "tzdb-zoneinfo", ] js = [ @@ -9,7 +17,7 @@ ] logging = ["dep:log"] serde = ["dep:serde"] -@@ -153,38 +151,16 @@ +@@ -158,46 +155,16 @@ ] tz-system = [ "std", @@ -40,6 +48,14 @@ [target.'cfg(not(target_family = "wasm"))'.dev-dependencies.hifitime] version = "3.9.0" +-[target.'cfg(not(target_has_atomic = "ptr"))'.dependencies.portable-atomic] +-version = "1.10.0" +-default-features = false +- +-[target.'cfg(not(target_has_atomic = "ptr"))'.dependencies.portable-atomic-util] +-version = "0.2.4" +-default-features = false +- -[target."cfg(windows)".dependencies.windows-sys] -version = ">=0.52.0, <=0.59.*" -features = [ diff --git a/jiff-fix-metadata.diff b/jiff-fix-metadata.diff index e02c256..511ee2e 100644 --- a/jiff-fix-metadata.diff +++ b/jiff-fix-metadata.diff @@ -1,6 +1,6 @@ ---- jiff-0.1.16/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ jiff-0.1.16/Cargo.toml 2024-12-27T00:19:01.401220+00:00 -@@ -113,9 +113,6 @@ +--- jiff-0.1.17/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ jiff-0.1.17/Cargo.toml 2024-12-31T17:02:33.130582+00:00 +@@ -114,9 +114,6 @@ [dev-dependencies.serde_json] version = "1.0.117" @@ -10,7 +10,7 @@ [dev-dependencies.tabwriter] version = "1.4.0" -@@ -161,6 +158,3 @@ +@@ -165,6 +162,3 @@ ] tzdb-zoneinfo = ["std"] diff --git a/rust-jiff.spec b/rust-jiff.spec index 21ac6c7..108fb94 100644 --- a/rust-jiff.spec +++ b/rust-jiff.spec @@ -5,7 +5,7 @@ %global crate jiff Name: rust-jiff -Version: 0.1.16 +Version: 0.1.17 Release: %autorelease Summary: Date-time library that encourages you to jump into the pit of success @@ -26,8 +26,6 @@ Patch10: 0001-Downstream-only-Omit-doctests-that-require-hifitime.patch Patch11: 0001-Downstream-only-Omit-doctests-that-require-icu.patch # * Downstream-only: Omit tests that require serde_yml. Patch12: 0001-Downstream-only-omit-tests-that-require-serde_yml.patch -# * Fix a small typo in CHANGELOG.md -Patch13: https://github.com/BurntSushi/jiff/pull/173.patch # * EPEL9: Ignore doctests that require very recent Rust compilers # * In this crate, doctests and examples (but not the lib and integration tests) # are allowed to use Rust features from versions newer than the MSRV. It’s diff --git a/rust2rpm.toml b/rust2rpm.toml index 1304779..15f29ac 100644 --- a/rust2rpm.toml +++ b/rust2rpm.toml @@ -53,13 +53,6 @@ comments = [ """, ] -[[package.extra-patches]] -number = 13 -file = "https://github.com/BurntSushi/jiff/pull/173.patch" -comments = [ - "Fix a small typo in CHANGELOG.md", -] - [[package.extra-patches]] number = 1009 file = "0001-EPEL9-Ignore-doctests-that-require-very-recent-Rust-.patch" diff --git a/sources b/sources index ccadc0d..80ee495 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jiff-0.1.16.crate) = e83ba1e75ad848666f3ed68c14c1f9a82cdb92360add760ec259837c562e487a830766981026ee7d537b701478b3713f80f52d8f996ade4eb1a126be126f200e +SHA512 (jiff-0.1.17.crate) = 9192a0d1f8556e086ec22ac237077a011716afc3c8c8438691d209a854be3f694814f2b156673be34f824a892724e2f82c9c28c5630be6bdf370159629204bb9