From cdeea00ad616d723559059b153b16dc8b80249ef Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jan 09 2022 00:13:00 +0000 Subject: Normalize weird glob-style dependencies to SemVer compatible format This fixes FTBFS issues against clap 2.34. --- diff --git a/lsd-fix-metadata.diff b/lsd-fix-metadata.diff index 5161633..c43a4e4 100644 --- a/lsd-fix-metadata.diff +++ b/lsd-fix-metadata.diff @@ -1,24 +1,90 @@ --- lsd-0.20.1/Cargo.toml 2021-03-07T07:05:00+00:00 -+++ lsd-0.20.1/Cargo.toml 2021-11-14T17:51:42.161839+00:00 -@@ -74,12 +74,12 @@ - version = "2.0.*" ++++ lsd-0.20.1/Cargo.toml 2022-01-09T00:10:35.213659+00:00 +@@ -27,29 +27,29 @@ + name = "lsd" + path = "src/main.rs" + [dependencies.ansi_term] +-version = "0.12.*" ++version = "0.12" + + [dependencies.chrono] +-version = "0.4.*" ++version = "0.4" + + [dependencies.chrono-humanize] +-version = "0.1.*" ++version = "0.1" + + [dependencies.clap] +-version = "2.33.*" ++version = "2.33" + features = ["suggestions", "color", "wrap_help"] + + [dependencies.dirs] +-version = "3.0.*" ++version = "3.0" + + [dependencies.globset] +-version = "0.4.*" ++version = "0.4" + + [dependencies.human-sort] + version = "0.2.2" + + [dependencies.libc] +-version = "0.2.*" ++version = "0.2" + + [dependencies.lscolors] + version = "0.7" +@@ -62,24 +62,24 @@ + version = "0.8" + + [dependencies.term_grid] +-version = "0.1.*" ++version = "0.1" + + [dependencies.terminal_size] +-version = "0.1.*" ++version = "0.1" + + [dependencies.unicode-width] +-version = "0.1.*" ++version = "0.1" + + [dependencies.wild] +-version = "2.0.*" ++version = "2.0" [dependencies.xdg] -version = "2.1.*" -+version = "2.4.*" ++version = "2.1" [dependencies.yaml-rust] - version = "0.4.*" +-version = "0.4.*" ++version = "0.4" [dev-dependencies.assert_cmd] -version = "1" +version = "2" [dev-dependencies.assert_fs] version = "1" -@@ -102,6 +102,3 @@ +@@ -93,15 +93,12 @@ + [dev-dependencies.tempfile] + version = "3" + [build-dependencies.clap] +-version = "2.33.*" ++version = "2.33" + + [build-dependencies.version_check] +-version = "0.9.*" ++version = "0.9" + + [features] sudo = [] [target."cfg(unix)".dependencies.users] - version = "0.11.*" +-version = "0.11.*" -[target."cfg(windows)".dependencies.winapi] -version = "0.3.*" -features = ["aclapi", "accctrl", "winnt", "winerror", "securitybaseapi", "winbase"] ++version = "0.11" diff --git a/rust-lsd.spec b/rust-lsd.spec index 0a01e8d..8134928 100644 --- a/rust-lsd.spec +++ b/rust-lsd.spec @@ -1,6 +1,5 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 20 %bcond_without check -%global __cargo_skip_build 0 %global crate lsd @@ -14,9 +13,9 @@ License: ASL 2.0 URL: https://crates.io/crates/lsd Source: %{crates_source} # Initial patched metadata -# - Remove Windows only dependencies -# - Bump xdg to 2.4.0 -# - Bump assert_cmd to 2 +# * drop windows-only dependencies +# * normalize weird glob-style dependencies to SemVer compatible format +# * bump assert_cmd from 1 to 2 Patch0: lsd-fix-metadata.diff ExclusiveArch: %{rust_arches}