diff --git a/mercurial-rust-metadata.patch b/mercurial-rust-metadata.patch index 179fee1..86220f9 100644 --- a/mercurial-rust-metadata.patch +++ b/mercurial-rust-metadata.patch @@ -16,15 +16,6 @@ Work around narrow constraint on im-rc - https://www.mercurial-scm.org/pipermail 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 -@@ -14,7 +14,7 @@ bytes-cast = "0.2" - byteorder = "1.3.4" - derive_more = "0.99" - home = "0.5" --im-rc = "15.0.*" -+im-rc = "15.0" - itertools = "0.9" - lazy_static = "1.4.0" - libc = "0.2" @@ -29,10 +29,10 @@ twox-hash = "1.5.0" same-file = "1.0.6" tempfile = "3.1.0" diff --git a/mercurial.spec b/mercurial.spec index d8a3470..9214095 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -10,7 +10,7 @@ Summary: A fast, lightweight Source Control Management system Name: mercurial Version: 6.1.4 -Release: 1%{?dist} +Release: 2%{?dist} # Release: 1.rc1%%{?dist} @@ -272,6 +272,9 @@ pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh %changelog +* Mon Jul 11 2022 Mads Kiilerich - 6.1.4-2 +- Fix build after upstream applied patch + * Thu Jun 16 2022 Mads Kiilerich - 6.1.4-1 - mercurial 6.1.4