From 473c8d53de038f479b7c5136568df6ca19808fb7 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sat, 8 Apr 2023 20:53:51 +0200 Subject: [PATCH] Use bytes-cast 0.3.0 - drop patching --- mercurial-rust-metadata.patch | 15 --------------- mercurial.spec | 2 -- 2 files changed, 17 deletions(-) delete mode 100644 mercurial-rust-metadata.patch diff --git a/mercurial-rust-metadata.patch b/mercurial-rust-metadata.patch deleted file mode 100644 index 2133ed7..0000000 --- a/mercurial-rust-metadata.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch cargo metadata for Fedora build - -Keep using old bytes-cast for now - https://www.mercurial-scm.org/repo/hg/rev/da02e88b4850 indicates that should be ok. - ---- a/rust/hg-core/Cargo.toml -+++ b/rust/hg-core/Cargo.toml -@@ -10,7 +10,7 @@ name = "hg" - - [dependencies] - bitflags = "1.3.2" --bytes-cast = "0.3.0" -+bytes-cast = "0.2.0" - byteorder = "1.4.3" - derive_more = "0.99.17" - hashbrown = { version = "0.13.1", features = ["rayon"] } diff --git a/mercurial.spec b/mercurial.spec index 64c3a5a..9cad777 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -21,8 +21,6 @@ License: GPLv2+ URL: https://mercurial-scm.org/ Source0: https://www.mercurial-scm.org/release/%{name}-%{upstreamversion}.tar.gz Source1: mercurial-site-start.el -# Patch cargo metadata for dependency versions available in Fedora -Patch0: mercurial-rust-metadata.patch BuildRequires: make BuildRequires: bash-completion BuildRequires: emacs-el