From 9f4d6c6187e25920222c0e7435a0d5a14b67b941 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 21 Jan 2023 14:56:31 -0600 Subject: [PATCH] Update to 0.74.0 Signed-off-by: Michel Alexandre Salim --- .gitignore | 1 + nu-utils-fix-metadata-auto.diff | 8 ++++++++ nu-utils-fix-metadata.diff | 17 +++++++++-------- rust-nu-utils.spec | 16 ++++++++-------- sources | 2 +- 5 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 nu-utils-fix-metadata-auto.diff diff --git a/.gitignore b/.gitignore index 713465c..e0e4002 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /nu-utils-0.60.0.crate /nu-utils-0.65.0.crate +/nu-utils-0.74.0.crate diff --git a/nu-utils-fix-metadata-auto.diff b/nu-utils-fix-metadata-auto.diff new file mode 100644 index 0000000..e1f48a5 --- /dev/null +++ b/nu-utils-fix-metadata-auto.diff @@ -0,0 +1,8 @@ +--- nu-utils-0.74.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ nu-utils-0.74.0/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -36,5 +36,3 @@ + [dependencies.sys-locale] + version = "0.2.1" + +-[target."cfg(windows)".dependencies.crossterm_winapi] +-version = "0.9.0" diff --git a/nu-utils-fix-metadata.diff b/nu-utils-fix-metadata.diff index 7add73e..e97ae4a 100644 --- a/nu-utils-fix-metadata.diff +++ b/nu-utils-fix-metadata.diff @@ -1,10 +1,11 @@ ---- nu-utils-0.65.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ nu-utils-0.65.0/Cargo.toml 2022-07-26T03:12:19.672253+00:00 -@@ -21,7 +21,3 @@ - name = "utils" +--- nu-utils-0.74.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ nu-utils-0.74.0/Cargo.toml 2023-01-21T20:55:29.438956+00:00 +@@ -23,7 +23,7 @@ path = "src/main.rs" --[dependencies] -- --[target."cfg(windows)".dependencies.crossterm_winapi] --version = "0.9.0" + [dependencies.lscolors] +-version = "0.12.0" ++version = "0.13.0" + features = ["crossterm"] + default-features = false + diff --git a/rust-nu-utils.spec b/rust-nu-utils.spec index 8269e04..21fe7b0 100644 --- a/rust-nu-utils.spec +++ b/rust-nu-utils.spec @@ -1,21 +1,21 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 23 %bcond_without check %global crate nu-utils -Name: rust-%{crate} -Version: 0.65.0 +Name: rust-nu-utils +Version: 0.74.0 Release: %autorelease Summary: Nushell utility functions -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/nu-utils Source: %{crates_source} -# Drop Windows Dependencies -Patch0: nu-utils-fix-metadata.diff - -ExclusiveArch: %{rust_arches} +# Automatically generated patch to strip foreign dependencies +Patch: nu-utils-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# * bump lscolors from 0.12.0 to 0.13.0 +Patch: nu-utils-fix-metadata.diff BuildRequires: rust-packaging >= 21 diff --git a/sources b/sources index a786d3f..2cc5237 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nu-utils-0.65.0.crate) = fbcf845252e24a224e5c845fd6401fabaafebbcd628f5a53dda123b33a6029e6089d35ada90f1c3a4aad59b18727a7ec66041e1b4dbff68b88ccd0df64d252b0 +SHA512 (nu-utils-0.74.0.crate) = 39efe4227b84cd04e25b5e11136c160d41b2a1c2512c3d789dfc6063f03c17cf11a56c1d4509276a4acd276b66717b9fadc99bdaf5708210e10d923b0df7abbf