diff --git a/.gitignore b/.gitignore index 1433e9c..fcd285d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /lsd-0.22.0.crate /lsd-0.23.1.crate /lsd-1.0.0.crate +/lsd-1.1.2.crate diff --git a/lsd-fix-metadata-auto.diff b/lsd-fix-metadata-auto.diff index e659ea2..beea133 100644 --- a/lsd-fix-metadata-auto.diff +++ b/lsd-fix-metadata-auto.diff @@ -1,8 +1,8 @@ ---- lsd-1.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ lsd-1.0.0/Cargo.toml 2024-02-13T20:21:38.768642+00:00 -@@ -146,11 +146,3 @@ +--- lsd-1.1.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ lsd-1.1.2/Cargo.toml 2024-04-25T13:37:12.094181+00:00 +@@ -148,11 +148,3 @@ [target."cfg(unix)".dependencies.xattr] - version = "0.2.*" + version = "1" -[target."cfg(windows)".dependencies.windows] -version = "0.43.0" diff --git a/lsd-fix-metadata.diff b/lsd-fix-metadata.diff index cfb7350..b581efd 100644 --- a/lsd-fix-metadata.diff +++ b/lsd-fix-metadata.diff @@ -1,75 +1,29 @@ ---- lsd-1.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ lsd-1.0.0/Cargo.toml 2024-02-13T20:22:27.794794+00:00 -@@ -37,7 +37,7 @@ - features = ["unstable-locales"] - - [dependencies.chrono-humanize] --version = "0.1.*" -+version = "0.2.*" +--- lsd-1.1.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ lsd-1.1.2/Cargo.toml 2024-04-25T13:37:25.555243+00:00 +@@ -41,7 +41,7 @@ + version = "0.2" [dependencies.clap] - version = "4.1" -@@ -51,7 +51,7 @@ - features = ["serde"] - - [dependencies.dirs] --version = "3.0.*" -+version = "3.0" - - [dependencies.globset] - version = "0.4.*" -@@ -63,7 +63,7 @@ +-version = "4.3.*" ++version = "4.3" + features = [ + "derive", + "wrap_help", +@@ -64,7 +64,7 @@ version = "0.2.*" [dependencies.lscolors] --version = "0.9.0" -+version = "0.13.0" +-version = "0.16.0" ++version = "0.17.0" [dependencies.once_cell] version = "1.17.1" -@@ -76,7 +76,7 @@ - version = "0.8" - - [dependencies.sys-locale] --version = "0.2.4" -+version = "0.3" - - [dependencies.term_grid] - version = "0.1.*" -@@ -91,22 +91,22 @@ - version = "0.1.*" - - [dependencies.url] --version = "2.1.*" -+version = "2.1" - - [dependencies.vsort] --version = "0.1.0" -+version = "0.2.0" - - [dependencies.wild] --version = "2.0.*" -+version = "2.0" - - [dependencies.xdg] --version = "2.1.*" -+version = "2.1" - - [dependencies.yaml-rust] - version = "0.4.*" - - [dev-dependencies.assert_cmd] --version = "1" -+version = "2" - - [dev-dependencies.assert_fs] - version = "1" -@@ -136,7 +136,7 @@ - sudo = [] +@@ -122,7 +122,7 @@ + version = "3" - [target."cfg(not(all(windows, target_arch = \"x86\", target_env = \"gnu\")))".dependencies.git2] --version = "0.16" -+version = "0.18" - optional = true - default-features = false + [build-dependencies.clap] +-version = "4.3.*" ++version = "4.3" + features = ["derive"] + [build-dependencies.clap_complete] diff --git a/rust-lsd.spec b/rust-lsd.spec index 210dec6..3bfbf92 100644 --- a/rust-lsd.spec +++ b/rust-lsd.spec @@ -1,10 +1,10 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check %global crate lsd Name: rust-lsd -Version: 1.0.0 +Version: 1.1.2 Release: %autorelease Summary: Ls command with a lot of pretty colors and some other stuff @@ -14,14 +14,8 @@ Source: %{crates_source} # Automatically generated patch to strip dependencies and normalize metadata Patch: lsd-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes -# https://github.com/lsd-rs/lsd/pull/938 -# * relax stricter-than-SemVer version requirements -# * bump chrono-humanize dependency from 0.1 to 0.2 -# * bump git2 dependency from 0.16 to 0.18 -# * bump lscolors dependency from 0.9 to 0.13 -# * bump sys-locale dependency from 0.2 to 0.3 -# * bump vsort dependency from 0.1 to 0.2 -# * bump assert_cmd dev-dependency from 1 to 2 +# * relax clap dependency from 4.3.* to ^4.3 +# * bump lscolors dependency from 0.16 to 0.17 Patch: lsd-fix-metadata.diff BuildRequires: cargo-rpm-macros >= 24 @@ -42,9 +36,10 @@ Summary: %{summary} # MIT # MIT OR Apache-2.0 # MIT OR Apache-2.0 OR Zlib +# MPL-2.0 # Unlicense OR MIT # Zlib OR Apache-2.0 OR MIT -License: Apache-2.0 AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) +License: Apache-2.0 AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT AND MPL-2.0 AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} @@ -52,7 +47,6 @@ License: Apache-2.0 AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception- %files -n %{crate} %license LICENSE %license LICENSE.dependencies -%doc CHANGELOG.md %doc README.md %{_bindir}/lsd diff --git a/sources b/sources index 05b454c..a6b4d4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lsd-1.0.0.crate) = 86414feab3926667233d186fb83dc1cbaad1b86e3096ac53a15b8c43545b42b0569265f4725bf07eb5814371edf44d916c0e81ea6e0d930446742cbe9d060204 +SHA512 (lsd-1.1.2.crate) = caf819750e682d95e533c3c6b5c41ca53b804e6b8547d00e99b8b2e04121403c2c213a9af5159be54f3950738e8ceb606ba6712ad2cda8d5f46bc09fb9f6fa0c