From 0e09815a488ba5c93264892b7d31e0942564088a Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <mads@kiilerich.com>
Date: Sep 04 2022 10:00:43 +0000
Subject: mercurial 6.2.2


---

diff --git a/.gitignore b/.gitignore
index cb2964e..dc49af8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@ mercurial-1.6.2.tar.gz
 /mercurial-6.1.4.tar.gz
 /mercurial-6.2.tar.gz
 /mercurial-6.2.1.tar.gz
+/mercurial-6.2.2.tar.gz
diff --git a/mercurial-rust-metadata.patch b/mercurial-rust-metadata.patch
index b47c73c..4b63c4b 100644
--- a/mercurial-rust-metadata.patch
+++ b/mercurial-rust-metadata.patch
@@ -1,25 +1,16 @@
 Patch cargo metadata for Fedora build
 
-Tweaks that hasn't been upstreamed for 6.2:
- - update one micro-timer to 0.4.0
- - update memmap2 to 0.5.3
-
 Update zstd to 0.11.0 (upstream is stuck on 0.5 because MSRV)
  - adapt for breaking changes in zstd 0.10.0
 
 diff --git a/rust/hg-core/Cargo.toml b/rust/hg-core/Cargo.toml
 --- a/rust/hg-core/Cargo.toml
 +++ b/rust/hg-core/Cargo.toml
-@@ -30,10 +30,10 @@ twox-hash = "1.6.2"
- same-file = "1.0.6"
- tempfile = "3.1.0"
- crossbeam-channel = "0.4"
--micro-timer = "0.3.0"
-+micro-timer = "0.4.0"
+@@ -33,7 +33,7 @@
+ micro-timer = "0.4.0"
  log = "0.4.8"
--memmap2 = {version = "0.4", features = ["stable_deref_trait"]}
+ memmap2 = { version = "0.5.3", features = ["stable_deref_trait"] }
 -zstd = "0.5.3"
-+memmap2 = {version = "0.5.3", features = ["stable_deref_trait"]}
 +zstd = "0.11"
  format-bytes = "0.3.0"
  
diff --git a/mercurial.spec b/mercurial.spec
index 6c51272..e0b7345 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -9,8 +9,8 @@
 
 Summary: A fast, lightweight Source Control Management system
 Name: mercurial
-Version: 6.2.1
-Release: 3%{?dist}
+Version: 6.2.2
+Release: 1%{?dist}
 
 # Release: 1.rc1%%{?dist}
 
@@ -273,6 +273,9 @@ pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh
 
 
 %changelog
+* Sun Sep 04 2022 Mads Kiilerich <mads@kiilerich.com> - 6.2.2-1
+- mercurial 6.2.2
+
 * Sat Aug 06 2022 Fabio Valentini <decathorpe@gmail.com> - 6.2.1-3
 - Bump zstd crate dependency from 0.10 to 0.11.
 
diff --git a/sources b/sources
index f27a3aa..0002956 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mercurial-6.2.1.tar.gz) = 4fd383870e5e5e684d4a74eef461c5b5fbf3c2fb1b62696edeadd3870ca5de1f7dfc9d2fc86a5022c36486640520ab0c8c23e099e08a38497b8345149b2aff37
+SHA512 (mercurial-6.2.2.tar.gz) = b5a89588146b58c8552c20f24a472098c6fbb9863c59571d0e70b1d4cc5ea6d4a29e9660a26dfc87aa5124df9b65182a7c65b8558a21acf0164d0d90358addbd