From a08af28fb55c52f39970e02b03d19c01adefc2bc Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 30 Aug 2023 16:30:08 +0200 Subject: [PATCH] Update to version 0.4.27; Fixes RHBZ#2235737 --- .gitignore | 1 + chrono-fix-metadata-auto.diff | 31 +++++++++++-------------------- chrono-fix-metadata.diff | 18 ++++++++++++------ rust-chrono.spec | 5 ++--- rust2rpm.conf | 2 -- sources | 2 +- 6 files changed, 27 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 74e8663..87af790 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /chrono-0.4.24.crate /chrono-0.4.25.crate /chrono-0.4.26.crate +/chrono-0.4.27.crate diff --git a/chrono-fix-metadata-auto.diff b/chrono-fix-metadata-auto.diff index 98c443c..57a2f50 100644 --- a/chrono-fix-metadata-auto.diff +++ b/chrono-fix-metadata-auto.diff @@ -1,20 +1,13 @@ ---- chrono-0.4.26/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ chrono-0.4.26/Cargo.toml 2023-05-31T11:36:00.457992+00:00 -@@ -107,7 +107,6 @@ - alloc = [] - clock = [ - "std", -- "winapi", - "iana-time-zone", - ] - default = [ -@@ -124,36 +123,10 @@ +--- chrono-0.4.27/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ chrono-0.4.27/Cargo.toml 2023-08-29T21:05:55.635779+00:00 +@@ -125,34 +125,11 @@ "alloc", ] wasmbind = [ - "wasm-bindgen", - "js-sys", ] +-winapi = ["windows-targets"] - -[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.js-sys] -version = "0.3" @@ -29,19 +22,17 @@ - -[target."cfg(target_os = \"android\")".dependencies.android-tzdata] -version = "0.1.1" +-optional = true ++winapi = [] [target."cfg(unix)".dependencies.iana-time-zone] version = "0.1.45" features = ["fallback"] optional = true --[target."cfg(windows)".dependencies.winapi] --version = "0.3.0" --features = [ -- "std", -- "minwinbase", -- "minwindef", -- "timezoneapi", -- "sysinfoapi", --] +-[target."cfg(windows)".dependencies.windows-targets] +-version = "0.48" -optional = true +- +-[target."cfg(windows)".dev-dependencies.windows-bindgen] +-version = "0.51" diff --git a/chrono-fix-metadata.diff b/chrono-fix-metadata.diff index 8e7bd62..f1077a9 100644 --- a/chrono-fix-metadata.diff +++ b/chrono-fix-metadata.diff @@ -1,5 +1,5 @@ ---- chrono-0.4.26/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ chrono-0.4.26/Cargo.toml 2023-05-31T11:36:51.237220+00:00 +--- chrono-0.4.27/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ chrono-0.4.27/Cargo.toml 2023-08-29T21:07:07.280031+00:00 @@ -41,26 +41,9 @@ [lib] name = "chrono" @@ -27,15 +27,20 @@ optional = true [dependencies.num-traits] -@@ -103,7 +86,6 @@ +@@ -102,20 +85,15 @@ + version = "1" [features] - __doctest = [] +-__doctest = [] -__internal_bench = ["criterion"] alloc = [] clock = [ "std", -@@ -113,7 +95,6 @@ +- "winapi", + "iana-time-zone", +- "android-tzdata", + ] + default = [ "clock", "std", "oldtime", @@ -43,12 +48,13 @@ ] libc = [] oldtime = ["time"] -@@ -122,8 +103,6 @@ +@@ -124,9 +102,6 @@ "pure-rust-locales", "alloc", ] -wasmbind = [ -] +-winapi = [] [target."cfg(unix)".dependencies.iana-time-zone] version = "0.1.45" diff --git a/rust-chrono.spec b/rust-chrono.spec index 0953add..5fae1dd 100644 --- a/rust-chrono.spec +++ b/rust-chrono.spec @@ -5,18 +5,17 @@ %global crate chrono Name: rust-chrono -Version: 0.4.26 +Version: 0.4.27 Release: %autorelease Summary: Date and time library for Rust -# Upstream license specification: MIT/Apache-2.0 License: MIT OR Apache-2.0 URL: https://crates.io/crates/chrono Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: chrono-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes -# * remove WASM-specific features +# * remove WASM- and doc-specific features # * drop unused, benchmark-only criterion dev-dependency to speed up builds Patch: chrono-fix-metadata.diff diff --git a/rust2rpm.conf b/rust2rpm.conf index a943c0d..f626714 100644 --- a/rust2rpm.conf +++ b/rust2rpm.conf @@ -1,4 +1,2 @@ [DEFAULT] all-features = true -unwanted-features = - __doctest diff --git a/sources b/sources index 39e1131..1a5dd40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chrono-0.4.26.crate) = 2b66faf4d8374cfb0485710ceb2c9c1ce63aa6f9670e405a0810af4aca01c57d8dcd198a1f4cad498d5efd89e00003ba1b4f0bab599422af4f9bd6fb74494c47 +SHA512 (chrono-0.4.27.crate) = 19c86589c11905ca16d68e59b500717329d08a9a431bbb51eabc2e1b15d1ab8902188e05337b0ec6fccc0c268a073c4e280dbd6605e80d4d4fcb17a4fdc5d9f0