public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-jiff] epel10: Update to version 0.2.29; Fixes RHBZ#2491099
@ 2026-06-21 10:41 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-06-21 10:41 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-jiff
Branch : epel10
Commit : c95eb33e4749475dfcd36c33e4822dbcf13bbcfd
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-06-21T10:35:25+01:00
Stats  : +114/-97 in 11 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-jiff/c/c95eb33e4749475dfcd36c33e4822dbcf13bbcfd?branch=epel10

Log:
Update to version 0.2.29; Fixes RHBZ#2491099

---
diff --git a/.gitignore b/.gitignore
index 060fdc8..27fb552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,5 @@
 /jiff-0.2.24.tar.gz
 /jiff-0.2.28.crate
 /jiff-0.2.28.tar.gz
+/jiff-0.2.29.crate
+/jiff-0.2.29.tar.gz

diff --git a/0001-Downstream-only-Omit-doctest-that-requires-time-tz.patch b/0001-Downstream-only-Omit-doctest-that-requires-time-tz.patch
deleted file mode 100644
index 08bc252..0000000
--- a/0001-Downstream-only-Omit-doctest-that-requires-time-tz.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 50880498ea71e96c99526e1b938ebfc0e79b9805 Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Thu, 12 Feb 2026 12:40:54 +0000
-Subject: [PATCH] Downstream-only: Omit doctest that requires time-tz
-
-It is not worth packaging it solely for a single doctest.
----
- COMPARE.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/COMPARE.md b/COMPARE.md
-index a28e9e3..d444b38 100644
---- a/COMPARE.md
-+++ b/COMPARE.md
-@@ -801,7 +801,7 @@ fn main() -> anyhow::Result<()> {
- 
- If you use `time-tz`, then you can make the above example with `time` work:
- 
--```rust
-+```ignore
- use anyhow::Context;
- use time::{ext::NumericalDuration, macros::datetime, Duration};
- use time_tz::{OffsetDateTimeExt, Tz};
--- 
-2.53.0
-

diff --git a/0001-Downstream-only-Omit-doctests-that-require-hifitime.patch b/0001-Downstream-only-Omit-doctests-that-require-hifitime.patch
index bcd0efc..8bc34f8 100644
--- a/0001-Downstream-only-Omit-doctests-that-require-hifitime.patch
+++ b/0001-Downstream-only-Omit-doctests-that-require-hifitime.patch
@@ -1,7 +1,7 @@
-From 746308fb5d05bfa1f162be28150c9375cfb96167 Mon Sep 17 00:00:00 2001
+From 156df136a053e509e78abeb0e503ff3020f12fe0 Mon Sep 17 00:00:00 2001
 From: "Benjamin A. Beasley" <code@musicinmybrain.net>
 Date: Thu, 22 Aug 2024 11:48:36 -0400
-Subject: [PATCH] Downstream-only: Omit doctests that require hifitime
+Subject: [PATCH 1/3] Downstream-only: Omit doctests that require hifitime
 
 It is not worth packaging it solely for a couple of tiny examples.
 ---
@@ -9,27 +9,27 @@ It is not worth packaging it solely for a couple of tiny examples.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/COMPARE.md b/COMPARE.md
-index b3d7ab4..b8b9d32 100644
+index b461ba5..d10072d 100644
 --- a/COMPARE.md
 +++ b/COMPARE.md
-@@ -1052,7 +1052,7 @@ In particular, when computing a duration from two `Epoch` values that spans
- a positive leap second (a second gets repeated), `hifitime` will correctly
- report the accurate duration:
+@@ -1148,7 +1148,7 @@ report the accurate duration. With that said, to get an accurate duration, one
+ of the two time scales has to be converted to to TAI (or another time scale
+ which does not have leap seconds):
  
 -```rust
-+```ignore
- use hifitime::{Duration, Epoch};
++```rust,ignore
+ use hifitime::{Duration, Epoch, TimeScale};
  
  fn main() -> anyhow::Result<()> {
-@@ -1106,7 +1106,7 @@ In contrast, `hifitime` appears to use saturating arithmetic everywhere (I've
+@@ -1204,7 +1204,7 @@ In contrast, `hifitime` appears to use saturating arithmetic everywhere (I've
  not been able to find this behavior documented though, so I'm not clear on what
  the intended semantics are):
  
 -```rust
-+```ignore
++```rust,ignore
  use hifitime::{Duration, Epoch};
  
  fn main() -> anyhow::Result<()> {
 -- 
-2.48.1
+2.54.0
 

diff --git a/0001-Downstream-only-Omit-doctests-that-require-jiff-stat.patch b/0001-Downstream-only-Omit-doctests-that-require-jiff-stat.patch
deleted file mode 100644
index bedac40..0000000
--- a/0001-Downstream-only-Omit-doctests-that-require-jiff-stat.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 147ddc0003f70e017c13966073211ed3dbcbcf7a Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Sun, 9 Mar 2025 09:12:34 -0400
-Subject: [PATCH] Downstream-only: Omit doctests that require jiff-static
-
----
- CHANGELOG.md  | 2 +-
- src/tz/mod.rs | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index f9651cf..7802eb8 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -6,7 +6,7 @@ This release of Jiff includes a new opt-in proc macro for embedding a
- `TimeZone` into your binary. Just enable Jiff's `static` feature, and this will
- print the current time in the `America/New_York` time zone:
- 
--```rust
-+```ignore
- use jiff::{
-     tz::{self, TimeZone},
-     Timestamp,
-diff --git a/src/tz/mod.rs b/src/tz/mod.rs
-index e9b1c92..768e070 100644
---- a/src/tz/mod.rs
-+++ b/src/tz/mod.rs
-@@ -100,7 +100,7 @@ a `TimeZone` at compile time. Here, we find the next DST transition from a
- particular timestamp in `Europe/Zurich`, and then print that in local time for
- Zurich:
- 
--```
-+```ignore
- use jiff::{tz::{self, TimeZone}, Timestamp};
- 
- static TZ: TimeZone = tz::get!("Europe/Zurich");
--- 
-2.48.1
-

diff --git a/0002-Downstream-only-Omit-doctests-that-require-jiff-stat.patch b/0002-Downstream-only-Omit-doctests-that-require-jiff-stat.patch
new file mode 100644
index 0000000..d24bb9f
--- /dev/null
+++ b/0002-Downstream-only-Omit-doctests-that-require-jiff-stat.patch
@@ -0,0 +1,39 @@
+From 52f6fbac34a195a6e42704a41f5d674ad2fedb7a Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Sun, 9 Mar 2025 09:12:34 -0400
+Subject: [PATCH 2/3] Downstream-only: Omit doctests that require jiff-static
+
+---
+ CHANGELOG.md  | 2 +-
+ src/tz/mod.rs | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index fdc863c..b924aec 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -586,7 +586,7 @@ This release of Jiff includes a new opt-in proc macro for embedding a
+ `TimeZone` into your binary. Just enable Jiff's `static` feature, and this will
+ print the current time in the `America/New_York` time zone:
+ 
+-```rust
++```ignore
+ use jiff::{
+     tz::{self, TimeZone},
+     Timestamp,
+diff --git a/src/tz/mod.rs b/src/tz/mod.rs
+index e5c1c6f..11d5bb1 100644
+--- a/src/tz/mod.rs
++++ b/src/tz/mod.rs
+@@ -100,7 +100,7 @@ a `TimeZone` at compile time. Here, we find the next DST transition from a
+ particular timestamp in `Europe/Zurich`, and then print that in local time for
+ Zurich:
+ 
+-```
++```ignore
+ use jiff::{tz::{self, TimeZone}, Timestamp};
+ 
+ static TZ: TimeZone = tz::get!("Europe/Zurich");
+-- 
+2.54.0
+

diff --git a/0003-Downstream-only-Omit-doctest-that-requires-time-tz.patch b/0003-Downstream-only-Omit-doctest-that-requires-time-tz.patch
new file mode 100644
index 0000000..fb8f1bc
--- /dev/null
+++ b/0003-Downstream-only-Omit-doctest-that-requires-time-tz.patch
@@ -0,0 +1,26 @@
+From b47c201f1749493b4139779af7ce1a2b31020948 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Thu, 12 Feb 2026 12:40:54 +0000
+Subject: [PATCH 3/3] Downstream-only: Omit doctest that requires time-tz
+
+It is not worth packaging it solely for a single doctest.
+---
+ COMPARE.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/COMPARE.md b/COMPARE.md
+index d10072d..b642c1c 100644
+--- a/COMPARE.md
++++ b/COMPARE.md
+@@ -801,7 +801,7 @@ fn main() -> anyhow::Result<()> {
+ 
+ If you use `time-tz`, then you can make the above example with `time` work:
+ 
+-```rust
++```ignore
+ use anyhow::Context;
+ use time::{ext::NumericalDuration, macros::datetime, Duration};
+ use time_tz::{OffsetDateTimeExt, Tz};
+-- 
+2.54.0
+

diff --git a/jiff-fix-metadata-auto.diff b/jiff-fix-metadata-auto.diff
index e757697..8c46cf8 100644
--- a/jiff-fix-metadata-auto.diff
+++ b/jiff-fix-metadata-auto.diff
@@ -1,23 +1,23 @@
---- jiff-0.2.28/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ jiff-0.2.28/Cargo.toml	2026-06-03T11:43:01.484182+00:00
+--- jiff-0.2.29/Cargo.toml	2006-07-24T01:21:28+00:00
++++ jiff-0.2.29/Cargo.toml	2026-06-21T09:35:14.840566+00:00
 @@ -69,7 +69,6 @@
  [features]
  alloc = [
      "serde_core?/alloc",
 -    "portable-atomic-util/alloc",
+     "defmt?/alloc",
  ]
  default = [
-     "std",
-@@ -81,8 +80,6 @@
-     "perf-inline",
+@@ -83,8 +82,6 @@
  ]
+ defmt = ["dep:defmt"]
  js = [
 -    "dep:wasm-bindgen",
 -    "dep:js-sys",
  ]
  logging = ["dep:log"]
  perf-inline = []
-@@ -100,14 +97,12 @@
+@@ -102,14 +99,12 @@
  tz-fat = ["jiff-static?/tz-fat"]
  tz-system = [
      "std",
@@ -32,7 +32,7 @@
      "alloc",
  ]
  tzdb-concatenated = ["std"]
-@@ -192,35 +187,11 @@
+@@ -201,35 +196,11 @@
  [dev-dependencies.walkdir]
  version = "2.5.0"
  
@@ -45,14 +45,14 @@
 -optional = true
 -
  [target."cfg(any())".dependencies.jiff-static]
- version = "=0.2.28"
+ version = "=0.2.29"
  
 -[target.'cfg(any(windows, target_family = "wasm"))'.dependencies.jiff-tzdb-platform]
 -version = "0.1.3"
 -optional = true
 -
  [target.'cfg(not(target_family = "wasm"))'.dev-dependencies.hifitime]
- version = "3.9.0"
+ version = "4.3.0"
 -
 -[target.'cfg(not(target_has_atomic = "ptr"))'.dependencies.portable-atomic]
 -version = "1.10.0"
@@ -68,7 +68,7 @@
  
  [lints.rust.unexpected_cfgs]
  level = "allow"
-@@ -230,3 +201,4 @@
+@@ -239,3 +210,4 @@
  [profile.testrelease]
  debug-assertions = false
  inherits = "test"

diff --git a/jiff-fix-metadata.diff b/jiff-fix-metadata.diff
index 102eac7..5cc1c6f 100644
--- a/jiff-fix-metadata.diff
+++ b/jiff-fix-metadata.diff
@@ -1,9 +1,18 @@
---- jiff-0.2.28/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ jiff-0.2.28/Cargo.toml	2026-06-03T11:43:01.485511+00:00
-@@ -79,28 +79,17 @@
+--- jiff-0.2.29/Cargo.toml	2006-07-24T01:21:28+00:00
++++ jiff-0.2.29/Cargo.toml	2026-06-21T09:35:14.841963+00:00
+@@ -69,7 +69,6 @@
+ [features]
+ alloc = [
+     "serde_core?/alloc",
+-    "defmt?/alloc",
+ ]
+ default = [
+     "std",
+@@ -80,29 +79,17 @@
      "tzdb-concatenated",
      "perf-inline",
  ]
+-defmt = ["dep:defmt"]
 -js = [
 -]
  logging = ["dep:log"]
@@ -30,11 +39,15 @@
  ]
  tzdb-bundle-platform = [
      "alloc",
-@@ -115,14 +104,6 @@
+@@ -117,18 +104,6 @@
  [[test]]
  name = "integration"
  path = "tests/lib.rs"
 -
+-[dependencies.defmt]
+-version = "1.0.0"
+-optional = true
+-
 -[dependencies.jiff-static]
 -version = "0.2"
 -optional = true

diff --git a/rust-jiff.spec b/rust-jiff.spec
index ec6a601..31d6546 100644
--- a/rust-jiff.spec
+++ b/rust-jiff.spec
@@ -5,7 +5,7 @@
 %global crate jiff
 
 Name:           rust-jiff
-Version:        0.2.28
+Version:        0.2.29
 Release:        %autorelease
 Summary:        Date-time library that encourages you to jump into the pit of success
 
@@ -31,14 +31,15 @@ Patch:          jiff-fix-metadata-auto.diff
 #   crate, and we do not see a good use case for static time zone databases in
 #   distribution packages, which are much better off using the system timezone
 #   database in general.
+# * Patch out the defmt feature; rust-defmt is not (yet) packaged
 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.
 Patch10:        0001-Downstream-only-Omit-doctests-that-require-hifitime.patch
 # * Downstream-only: Omit doctests that require jiff-static
-Patch11:        0001-Downstream-only-Omit-doctests-that-require-jiff-stat.patch
+Patch11:        0002-Downstream-only-Omit-doctests-that-require-jiff-stat.patch
 # * Downstream-only: Omit doctest that requires time-tz
-Patch12:        0001-Downstream-only-Omit-doctest-that-requires-time-tz.patch
+Patch12:        0003-Downstream-only-Omit-doctest-that-requires-time-tz.patch
 
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  tomcli

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 906740f..ca412e0 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -22,6 +22,7 @@ cargo-toml-patch-comments = [
     distribution packages, which are much better off using the system timezone \
     database in general.\
     """,
+    "Patch out the defmt feature; rust-defmt is not (yet) packaged",
 ]
 doc-files.exclude = [
     # These files are included as (documentation) strings in the library, so
@@ -60,14 +61,14 @@ comments = [
 
 [[package.extra-patches]]
 number = 11
-file = "0001-Downstream-only-Omit-doctests-that-require-jiff-stat.patch"
+file = "0002-Downstream-only-Omit-doctests-that-require-jiff-stat.patch"
 comments = [
     "Downstream-only: Omit doctests that require jiff-static",
 ]
 
 [[package.extra-patches]]
 number = 12
-file = "0001-Downstream-only-Omit-doctest-that-requires-time-tz.patch"
+file = "0003-Downstream-only-Omit-doctest-that-requires-time-tz.patch"
 comments = [
     "Downstream-only: Omit doctest that requires time-tz",
 ]

diff --git a/sources b/sources
index 7fb3212..29ded5b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jiff-0.2.28.crate) = bcd05d652c1b36106aa64a38e2d57f03bc1287b3796f3e7dc5c0cf11283a7cb8d24eb2640044f908566ba25b980ae127acee1c3318c94d7b9a28e1e888aaad87
-SHA512 (jiff-0.2.28.tar.gz) = 4daa665f1059dc73e6698c1a9c429ba45e4e0aab97be4bf88fe6a2ea875a3a8f69c321f646944ddbb557580e760fd999f3703012ac4c1ae4271981d07da9b59f
+SHA512 (jiff-0.2.29.crate) = 832f82b7d7126fb74a57aef033d331b724ee5c8076dcc1eb9a3bbd0af0660d592ead90bb9b2f51146339b1796dffd01ee9d1c29f73626e846b71a2552773911c
+SHA512 (jiff-0.2.29.tar.gz) = 774f5945bfe1cf4ab4ab6135bda120e83949cf30380859f2e0d5098665c17bce6f14739e6e686258733fb0de7df2b29c8d7e068d7aa96448993d093ba69e8724

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-21 10:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-21 10:41 [rpms/rust-jiff] epel10: Update to version 0.2.29; Fixes RHBZ#2491099 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