From 469baed0d9d78b8b95daf854442c48a5817eeb0d Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 22 May 2023 23:03:35 +0200 Subject: [PATCH] Regenerate with rust2rpm v24 and update license tag --- README.md | 3 --- exa-fix-metadata.diff | 2 +- rust-exa.spec | 56 +++++++++++++++++++------------------------ 3 files changed, 25 insertions(+), 36 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 6fb7907..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-exa - -The rust-exa package \ No newline at end of file diff --git a/exa-fix-metadata.diff b/exa-fix-metadata.diff index 440d2f9..261281c 100644 --- a/exa-fix-metadata.diff +++ b/exa-fix-metadata.diff @@ -1,5 +1,5 @@ --- exa-0.10.1/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ exa-0.10.1/Cargo.toml 2021-07-20T13:09:28.108670+00:00 ++++ exa-0.10.1/Cargo.toml 2023-05-22T20:56:26.938833+00:00 @@ -97,4 +97,3 @@ [features] default = ["git"] diff --git a/rust-exa.spec b/rust-exa.spec index 4794b6a..8f0c38f 100644 --- a/rust-exa.spec +++ b/rust-exa.spec @@ -1,59 +1,48 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 24 %bcond_without check -%global __cargo_skip_build 0 %global crate exa -Name: rust-%{crate} +Name: rust-exa Version: 0.10.1 Release: %autorelease Summary: Modern replacement for ls -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/exa Source: %{crates_source} -# Initial patched metadata -# * disable feature for vendored OpenSSL -Patch0: exa-fix-metadata.diff +# Manually created patch for downstream crate metadata changes +# * remove feature for statically linking against a vendored copy of OpenSSL +Patch: exa-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 23 %global _description %{expand: -exa is a modern replacement for the command-line program ls that ships -with Unix and Linux operating systems, with more features and better defaults. -It uses colours to distinguish file types and metadata. -It knows about symlinks, extended attributes, and Git. And it’s small, fast, -and just one single binary.} +A modern replacement for ls.} %description %{_description} %package -n %{crate} Summary: %{summary} # MIT -# MIT or ASL 2.0 -# MIT or ASL 2.0 or zlib -# Unlicense or MIT -# zlib or ASL 2.0 or MIT -License: MIT +# MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR Zlib +# Unlicense OR MIT +# Zlib OR Apache-2.0 OR MIT +License: MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (Unlicense OR MIT) +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} %license LICENCE +%license LICENSE.dependencies %doc README.md %{_bindir}/exa -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/exa.bash -%dir %{_datadir}/fish -%dir %{_datadir}/fish/vendor_completions.d -%{_datadir}/fish/vendor_completions.d/exa.fish -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/_exa +%{bash_completions_dir}/exa.bash +%{fish_completions_dir}/exa.fish +%{zsh_completions_dir}/_exa %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -64,15 +53,18 @@ License: MIT %build %cargo_build +%cargo_license_summary +%{cargo_license} > LICENSE.dependencies %install %cargo_install +# install shell completions install -Dpm0644 -T completions/completions.bash \ - %{buildroot}%{_datadir}/bash-completion/completions/exa.bash + %{buildroot}/%{bash_completions_dir}/exa.bash install -Dpm0644 -T completions/completions.fish \ - %{buildroot}%{_datadir}/fish/vendor_completions.d/exa.fish + %{buildroot}/%{fish_completions_dir}/exa.fish install -Dpm0644 -T completions/completions.zsh \ - %{buildroot}%{_datadir}/zsh/site-functions/_exa + %{buildroot}/%{zsh_completions_dir}/_exa %if %{with check} %check