From 110ff7e3bd6b640954eded24a966f717786d07a2 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 29 May 2023 19:46:57 +0200 Subject: [PATCH] Update to version 0.4.25; Fixes RHBZ#2210747 --- .gitignore | 1 + chrono-fix-metadata-auto.diff | 12 ++++++++---- chrono-fix-metadata.diff | 14 +++++++------- rust-chrono.spec | 5 ++--- sources | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 230751b..e24d98b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /chrono-0.4.22.crate /chrono-0.4.23.crate /chrono-0.4.24.crate +/chrono-0.4.25.crate diff --git a/chrono-fix-metadata-auto.diff b/chrono-fix-metadata-auto.diff index 6adbc72..3eea7b8 100644 --- a/chrono-fix-metadata-auto.diff +++ b/chrono-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- chrono-0.4.24/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ chrono-0.4.24/Cargo.toml 2023-03-12T23:42:24.779495+00:00 -@@ -114,7 +114,6 @@ +--- chrono-0.4.25/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ chrono-0.4.25/Cargo.toml 2023-05-29T17:43:15.587725+00:00 +@@ -111,7 +111,6 @@ alloc = [] clock = [ "std", @@ -8,7 +8,7 @@ "iana-time-zone", ] default = [ -@@ -131,32 +130,10 @@ +@@ -128,36 +127,10 @@ "alloc", ] wasmbind = [ @@ -26,6 +26,9 @@ - -[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test] -version = "0.3" +- +-[target."cfg(target_os = \"android\")".dependencies.android-tzdata] +-version = "0.1.1" [target."cfg(unix)".dependencies.iana-time-zone] version = "0.1.45" @@ -39,5 +42,6 @@ - "minwinbase", - "minwindef", - "timezoneapi", +- "sysinfoapi", -] -optional = true diff --git a/chrono-fix-metadata.diff b/chrono-fix-metadata.diff index d771d29..9d811c0 100644 --- a/chrono-fix-metadata.diff +++ b/chrono-fix-metadata.diff @@ -1,6 +1,6 @@ ---- chrono-0.4.24/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ chrono-0.4.24/Cargo.toml 2023-03-12T23:43:22.505687+00:00 -@@ -40,26 +40,9 @@ +--- chrono-0.4.25/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ chrono-0.4.25/Cargo.toml 2023-05-29T17:43:50.526927+00:00 +@@ -41,26 +41,9 @@ [lib] name = "chrono" @@ -26,8 +26,8 @@ -version = "0.4.0" optional = true - [dependencies.num-integer] -@@ -110,7 +93,6 @@ + [dependencies.num-traits] +@@ -107,7 +90,6 @@ [features] __doctest = [] @@ -35,7 +35,7 @@ alloc = [] clock = [ "std", -@@ -120,7 +102,6 @@ +@@ -117,7 +99,6 @@ "clock", "std", "oldtime", @@ -43,7 +43,7 @@ ] libc = [] oldtime = ["time"] -@@ -129,8 +110,6 @@ +@@ -126,8 +107,6 @@ "pure-rust-locales", "alloc", ] diff --git a/rust-chrono.spec b/rust-chrono.spec index c0c3e94..501f9b1 100644 --- a/rust-chrono.spec +++ b/rust-chrono.spec @@ -5,7 +5,7 @@ %global crate chrono Name: rust-chrono -Version: 0.4.24 +Version: 0.4.25 Release: %autorelease Summary: Date and time library for Rust @@ -16,7 +16,7 @@ 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-specific features # * drop unused, benchmark-only criterion dev-dependency to speed up builds Patch: chrono-fix-metadata.diff @@ -38,7 +38,6 @@ use the "%{crate}" crate. %files devel %license %{crate_instdir}/LICENSE.txt -%doc %{crate_instdir}/AUTHORS.txt %doc %{crate_instdir}/CHANGELOG.md %doc %{crate_instdir}/README.md %{crate_instdir}/ diff --git a/sources b/sources index 798c36f..2cee6e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chrono-0.4.24.crate) = 1a9121870aa4d76448a1b118a2e135a145a55c7784c4f5a4f25732f8597b8655f32cbce174bdd65c2dc7b17dcc3a608454d0e3dc29b86338e42a839f8be1e4fd +SHA512 (chrono-0.4.25.crate) = f308d42f0e6b631e6ac2a13f4ab37c0465b045ea6694786b4ed45e971924a1f16db85d8670d084fca70e4cc706af0825fe13704175851f173d76246bf3cbc40f