public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-jiff] f44: Update to version 0.2.33
@ 2026-07-27 10:59 Benjamin A. Beasley
0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-07-27 10:59 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rust-jiff
Branch : f44
Commit : ff21c5542e4f0a82d484fbbc267ed9f76954dbb6
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-07-27T11:50:12+01:00
Stats : +101/-30 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/rust-jiff/c/ff21c5542e4f0a82d484fbbc267ed9f76954dbb6?branch=f44
Log:
Update to version 0.2.33
---
diff --git a/0001-Fixes-for-testing-from-released-crates-since-jiff-co.patch b/0001-Fixes-for-testing-from-released-crates-since-jiff-co.patch
new file mode 100644
index 0000000..146cd3f
--- /dev/null
+++ b/0001-Fixes-for-testing-from-released-crates-since-jiff-co.patch
@@ -0,0 +1,48 @@
+From c369846ba09b9655ee7dce015b40d74eeacac41e Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Sun, 19 Jul 2026 14:52:33 +0100
+Subject: [PATCH] Fixes for testing from released crates since jiff-core split
+
+---
+ src/tz/tzif.rs | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/tz/tzif.rs b/src/tz/tzif.rs
+index 5255491..53ad3e3 100644
+--- a/src/tz/tzif.rs
++++ b/src/tz/tzif.rs
+@@ -43,8 +43,8 @@ mod tests {
+ }
+ }
+
+- fn datetime(dt: tzif::DateTime) -> jiff::civil::DateTime {
+- jiff::civil::DateTime::constant(
++ fn datetime(dt: tzif::DateTime) -> crate::civil::DateTime {
++ crate::civil::DateTime::constant(
+ dt.year(),
+ dt.month(),
+ dt.day(),
+@@ -67,7 +67,7 @@ mod tests {
+ out,
+ " {i:03}:\toffset={off}\t\
+ designation={desig}\t{dst}\tindicator={ind}",
+- off = jiff::tz::Offset::from_seconds(typ.offset.seconds())
++ off = jcore::tz::Offset::from_seconds(typ.offset.seconds())
+ .unwrap(),
+ desig = tzif.designations[usize::from(typ.designation)],
+ dst = if typ.dst.is_dst() { "dst" } else { "" },
+@@ -107,8 +107,9 @@ mod tests {
+ {desig}\t{dst}",
+ ts = timestamp.as_second(),
+ type_index = trans.infos[i].type_index,
+- off = jiff::tz::Offset::from_seconds(typ.offset.seconds())
+- .unwrap(),
++ off =
++ jcore::tz::Offset::from_seconds(typ.offset.seconds())
++ .unwrap(),
+ desig = tzif.designations[usize::from(typ.designation)],
+ dst = if typ.dst.is_dst() { "dst" } else { "" },
+ )
+--
+2.55.0
+
diff --git a/jiff-fix-metadata-auto.diff b/jiff-fix-metadata-auto.diff
index 5dafedb..84decb3 100644
--- a/jiff-fix-metadata-auto.diff
+++ b/jiff-fix-metadata-auto.diff
@@ -1,24 +1,24 @@
---- jiff-0.2.32/Cargo.toml 2006-07-24T01:21:28+00:00
-+++ jiff-0.2.32/Cargo.toml 2026-07-09T11:10:45.578092+00:00
-@@ -69,7 +69,6 @@
- [features]
+--- jiff-0.2.33/Cargo.toml 2006-07-24T01:21:28+00:00
++++ jiff-0.2.33/Cargo.toml 2026-07-19T17:53:10.524624+00:00
+@@ -70,7 +70,6 @@
alloc = [
+ "jcore/alloc",
"serde_core?/alloc",
- "portable-atomic-util/alloc",
"defmt?/alloc",
]
default = [
-@@ -83,8 +82,6 @@
+@@ -87,8 +86,6 @@
+ "jcore/defmt",
]
- defmt = ["dep:defmt"]
js = [
- "dep:wasm-bindgen",
- "dep:js-sys",
]
- logging = ["dep:log"]
- perf-inline = []
-@@ -102,14 +99,12 @@
- tz-fat = ["jiff-static?/tz-fat"]
+ logging = [
+ "dep:log",
+@@ -113,14 +110,12 @@
+ ]
tz-system = [
"std",
- "dep:windows-link",
@@ -32,7 +32,7 @@
"alloc",
]
tzdb-concatenated = ["std"]
-@@ -201,35 +196,11 @@
+@@ -217,35 +212,11 @@
[dev-dependencies.walkdir]
version = "2.5.0"
@@ -45,7 +45,7 @@
-optional = true
-
[target."cfg(any())".dependencies.jiff-static]
- version = "=0.2.32"
+ version = "=0.2.33"
-[target.'cfg(any(windows, target_family = "wasm"))'.dependencies.jiff-tzdb-platform]
-version = "0.1.3"
@@ -68,7 +68,7 @@
[lints.rust.unexpected_cfgs]
level = "allow"
-@@ -239,3 +210,4 @@
+@@ -258,3 +229,4 @@
[profile.testrelease]
debug-assertions = false
inherits = "test"
diff --git a/jiff-fix-metadata.diff b/jiff-fix-metadata.diff
index af96f22..486b515 100644
--- a/jiff-fix-metadata.diff
+++ b/jiff-fix-metadata.diff
@@ -1,21 +1,27 @@
---- jiff-0.2.32/Cargo.toml 2006-07-24T01:21:28+00:00
-+++ jiff-0.2.32/Cargo.toml 2026-07-09T11:11:26.956614+00:00
-@@ -69,7 +69,6 @@
- [features]
+--- jiff-0.2.33/Cargo.toml 2006-07-24T01:21:28+00:00
++++ jiff-0.2.33/Cargo.toml 2026-07-19T17:53:10.526016+00:00
+@@ -70,7 +70,6 @@
alloc = [
+ "jcore/alloc",
"serde_core?/alloc",
- "defmt?/alloc",
]
default = [
"std",
-@@ -80,29 +79,17 @@
+@@ -81,23 +80,12 @@
"tzdb-concatenated",
"perf-inline",
]
--defmt = ["dep:defmt"]
+-defmt = [
+- "dep:defmt",
+- "jcore/defmt",
+-]
-js = [
-]
- logging = ["dep:log"]
+ logging = [
+ "dep:log",
+ "jcore/logging",
+ ]
perf-inline = []
serde = ["dep:serde_core"]
-static = [
@@ -25,11 +31,13 @@
-static-tz = ["dep:jiff-static"]
std = [
"alloc",
- "log?/std",
- "serde_core?/std",
+ "jcore/std",
+@@ -106,14 +94,9 @@
+ ]
+ tz-fat = [
+ "jcore/tz-fat",
+- "jiff-static?/tz-fat",
]
--tz-fat = ["jiff-static?/tz-fat"]
-+tz-fat = []
tz-system = [
"std",
-]
@@ -39,15 +47,19 @@
]
tzdb-bundle-platform = [
"alloc",
-@@ -117,18 +104,6 @@
- [[test]]
+@@ -129,22 +112,10 @@
name = "integration"
path = "tests/lib.rs"
--
+
-[dependencies.defmt]
-version = "1.0.0"
-optional = true
-
+ [dependencies.jcore]
+ version = "0.1.0"
+ default-features = false
+ package = "jiff-core"
+-
-[dependencies.jiff-static]
-version = "0.2"
-optional = true
diff --git a/rust-jiff.spec b/rust-jiff.spec
index 63fdc22..227c8ca 100644
--- a/rust-jiff.spec
+++ b/rust-jiff.spec
@@ -5,7 +5,7 @@
%global crate jiff
Name: rust-jiff
-Version: 0.2.32
+Version: 0.2.33
Release: %autorelease
Summary: Date-time library that encourages you to jump into the pit of success
@@ -40,6 +40,9 @@ Patch10: 0001-Downstream-only-Omit-doctests-that-require-hifitime.patch
Patch11: 0002-Downstream-only-Omit-doctests-that-require-jiff-stat.patch
# * Downstream-only: Omit doctest that requires time-tz
Patch12: 0003-Downstream-only-Omit-doctest-that-requires-time-tz.patch
+# * Fixes for testing from released crates since jiff-core split
+# * https://github.com/BurntSushi/jiff/pull/611
+Patch13: 0001-Fixes-for-testing-from-released-crates-since-jiff-co.patch
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: tomcli
diff --git a/rust2rpm.toml b/rust2rpm.toml
index ca412e0..39125b4 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -73,6 +73,14 @@ comments = [
"Downstream-only: Omit doctest that requires time-tz",
]
+[[package.extra-patches]]
+number = 13
+file = "0001-Fixes-for-testing-from-released-crates-since-jiff-co.patch"
+comments = [
+ "Fixes for testing from released crates since jiff-core split",
+ "https://github.com/BurntSushi/jiff/pull/611",
+]
+
[requires]
build = [
"tomcli",
diff --git a/sources b/sources
index fb33282..7502e16 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jiff-0.2.32.crate) = ba1b80a950e358497211827743e1e982373f4bd43226beb36d69e59e5a7b9e211083e2ba96839d891ec1d2a9b4e9cdc8f86401d9958aef9495c84199a936aaf5
-SHA512 (jiff-0.2.32.tar.gz) = 778df188c7c403cffe9ffcb760040ac8af34857a2bce35aa3af1485c2549b1e6ef6928b4d57ecd345483b4f2e8415a41802e5a46508858f8f9cd44bcd38142cc
+SHA512 (jiff-0.2.33.crate) = 5745bff0fe36e20a0d50a1f28a579bc45ef35a48d31a963b45e12fe4d92eb97f52104c357b4717b197d19ed5120de560a5f5688089a6a19aa84731684671a04c
+SHA512 (jiff-0.2.33.tar.gz) = b02f80aa768e9ec85239b2d57e4ee3278ce80189270720081d06564ede541a807a853bba130a6edfb829b862afec981ee9998a2069203c93c88430b61e8c29d7
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-27 10:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-27 10:59 [rpms/rust-jiff] f44: Update to version 0.2.33 Benjamin A. Beasley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox