public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-jiff] epel10.2: Update to version 0.2.34
@ 2026-07-27 10:58 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-07-27 10:58 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-jiff
Branch : epel10.2
Commit : 464f5984800dc5965f2759e0652af9b59e0de481
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-07-27T11:51:57+01:00
Stats  : +27/-84 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-jiff/c/464f5984800dc5965f2759e0652af9b59e0de481?branch=epel10.2

Log:
Update to version 0.2.34

---
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
deleted file mode 100644
index 146cd3f..0000000
--- a/0001-Fixes-for-testing-from-released-crates-since-jiff-co.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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 84decb3..0a35422 100644
--- a/jiff-fix-metadata-auto.diff
+++ b/jiff-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
---- 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
+--- jiff-0.2.34/Cargo.toml	2006-07-24T01:21:28+00:00
++++ jiff-0.2.34/Cargo.toml	2026-07-20T06:12:32.476545+00:00
 @@ -70,7 +70,6 @@
  alloc = [
      "jcore/alloc",
@@ -32,7 +32,7 @@
      "alloc",
  ]
  tzdb-concatenated = ["std"]
-@@ -217,35 +212,11 @@
+@@ -217,37 +212,14 @@
  [dev-dependencies.walkdir]
  version = "2.5.0"
  
@@ -45,7 +45,7 @@
 -optional = true
 -
  [target."cfg(any())".dependencies.jiff-static]
- version = "=0.2.33"
+ version = "=0.2.34"
  
 -[target.'cfg(any(windows, target_family = "wasm"))'.dependencies.jiff-tzdb-platform]
 -version = "0.1.3"
@@ -68,8 +68,6 @@
  
  [lints.rust.unexpected_cfgs]
  level = "allow"
-@@ -258,3 +229,4 @@
- [profile.testrelease]
- debug-assertions = false
- inherits = "test"
+ priority = 0
+ check-cfg = ["cfg(docsrs_jiff)"]
 +

diff --git a/jiff-fix-metadata.diff b/jiff-fix-metadata.diff
index 486b515..79aaea6 100644
--- a/jiff-fix-metadata.diff
+++ b/jiff-fix-metadata.diff
@@ -1,5 +1,5 @@
---- 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
+--- jiff-0.2.34/Cargo.toml	2006-07-24T01:21:28+00:00
++++ jiff-0.2.34/Cargo.toml	2026-07-20T06:12:32.478377+00:00
 @@ -70,7 +70,6 @@
  alloc = [
      "jcore/alloc",

diff --git a/rust-jiff.spec b/rust-jiff.spec
index 227c8ca..9a2c5b1 100644
--- a/rust-jiff.spec
+++ b/rust-jiff.spec
@@ -5,7 +5,7 @@
 %global crate jiff
 
 Name:           rust-jiff
-Version:        0.2.33
+Version:        0.2.34
 Release:        %autorelease
 Summary:        Date-time library that encourages you to jump into the pit of success
 
@@ -40,9 +40,6 @@ 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
@@ -233,13 +230,15 @@ tomcli set Cargo.toml del 'target."cfg(any())".dependencies.jiff-static'
 # but not included in the released crate. By doing so here in %%check rather
 # than in %%prep, we prove that the binary RPMs are derived solely from the
 # published crate sources.
-tar -xzvf '%{SOURCE10}' --strip-components=1 \
-    jiff-%{version}/src/tz/snapshots \
-    jiff-%{version}/src/tz/testdata \
-    jiff-%{version}/tests
+tar --extract --gzip --verbose --file '%{SOURCE10}' \
+    --strip-components=3 \
+    jiff-%{version}/crates/jiff/src/tz/snapshots \
+    jiff-%{version}/crates/jiff/src/tz/testdata \
+    jiff-%{version}/crates/jiff/tests
 # These tests would require the "static"/"static-tz" features:
-rm -rv tests/procmacro/
-sed -r -i 's@^mod procmacro;@// &@' tests/lib.rs
+rm --recursive --verbose tests/procmacro/
+sed --regexp-extended --in-place 's@^mod procmacro;@// &@' \
+    tests/lib.rs
 %cargo_test -f serde
 %endif
 

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 39125b4..f7eb732 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -73,14 +73,6 @@ 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",
@@ -110,12 +102,14 @@ pre = [
 # but not included in the released crate. By doing so here in %%check rather
 # than in %%prep, we prove that the binary RPMs are derived solely from the
 # published crate sources.
-tar -xzvf '%{SOURCE10}' --strip-components=1 \\
-    jiff-%{version}/src/tz/snapshots \\
-    jiff-%{version}/src/tz/testdata \\
-    jiff-%{version}/tests
+tar --extract --gzip --verbose --file '%{SOURCE10}' \\
+    --strip-components=3 \\
+    jiff-%{version}/crates/jiff/src/tz/snapshots \\
+    jiff-%{version}/crates/jiff/src/tz/testdata \\
+    jiff-%{version}/crates/jiff/tests
 # These tests would require the "static"/"static-tz" features:
-rm -rv tests/procmacro/
-sed -r -i 's@^mod procmacro;@// &@' tests/lib.rs\
+rm --recursive --verbose tests/procmacro/
+sed --regexp-extended --in-place 's@^mod procmacro;@// &@' \\
+    tests/lib.rs\
 """,
 ]

diff --git a/sources b/sources
index 7502e16..5cd0bc0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jiff-0.2.33.crate) = 5745bff0fe36e20a0d50a1f28a579bc45ef35a48d31a963b45e12fe4d92eb97f52104c357b4717b197d19ed5120de560a5f5688089a6a19aa84731684671a04c
-SHA512 (jiff-0.2.33.tar.gz) = b02f80aa768e9ec85239b2d57e4ee3278ce80189270720081d06564ede541a807a853bba130a6edfb829b862afec981ee9998a2069203c93c88430b61e8c29d7
+SHA512 (jiff-0.2.34.crate) = 401179e39fcdd06fb924b9808858aec64cccc03353f21627437aa7f74b66756bff621e8a70aaa247d0e39854e23f919d585ec5787e1043709b9a0be09c69c745
+SHA512 (jiff-0.2.34.tar.gz) = 2017d05a62b30f71a4f00d2b879017d307d18eaf7fc717aa0a8ce9cc516f70dc803284676d12298f896d4a845e6904b3472b7c44ae2049ee0afe9d42dac52355

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

only message in thread, other threads:[~2026-07-27 10:58 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:58 [rpms/rust-jiff] epel10.2: Update to version 0.2.34 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