From be062b155b862f0d8f47ccd31a338a19a105accd Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 19 Apr 2023 17:02:41 +0200 Subject: [PATCH] Update to version 0.9.0; Fixes RHBZ#2123687 --- .gitignore | 1 + LICENSE.dependencies | 47 ------------------------------- README.md | 3 -- rust-zoxide.spec | 53 ++++++++++++++++++----------------- sources | 2 +- zoxide-fix-metadata-auto.diff | 6 ++-- zoxide-fix-metadata.diff | 29 +++++++++++++++---- 7 files changed, 56 insertions(+), 85 deletions(-) delete mode 100644 LICENSE.dependencies delete mode 100644 README.md diff --git a/.gitignore b/.gitignore index a353f3b..845a05f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zoxide-0.8.0.crate /zoxide-0.8.2.crate /zoxide-0.8.3.crate +/zoxide-0.9.0.crate diff --git a/LICENSE.dependencies b/LICENSE.dependencies deleted file mode 100644 index 6ef2e3d..0000000 --- a/LICENSE.dependencies +++ /dev/null @@ -1,47 +0,0 @@ -ASL 2.0 or MIT: rust-autocfg 1.1.0 -ASL 2.0 or MIT: rust-fastrand 1.7.0 -ASL 2.0 or MIT: rust-indexmap 1.9.1 -CC0: rust-dunce 1.0.2 -MIT OR Apache-2.0: rust-clap 3.2.12 -MIT OR Apache-2.0: rust-clap_complete 3.2.3 -MIT OR Apache-2.0: rust-clap_derive 3.2.7 -MIT OR Apache-2.0: rust-clap_lex 0.2.4 -MIT or ASL 2.0: rust-anyhow 1.0.58 -MIT or ASL 2.0: rust-askama 0.11.1 -MIT or ASL 2.0: rust-askama_derive 0.11.2 -MIT or ASL 2.0: rust-askama_escape 0.10.3 -MIT or ASL 2.0: rust-askama_shared 0.12.2 -MIT or ASL 2.0: rust-bitflags 1.3.2 -MIT or ASL 2.0: rust-cfg-if 1.0.0 -MIT or ASL 2.0: rust-clap_complete_fig 3.2.4 -MIT or ASL 2.0: rust-dirs 4.0.0 -MIT or ASL 2.0: rust-dirs-sys 0.3.7 -MIT or ASL 2.0: rust-glob 0.3.0 -MIT or ASL 2.0: rust-hashbrown 0.12.3 -MIT or ASL 2.0: rust-heck 0.4.0 -MIT or ASL 2.0: rust-libc 0.2.126 -MIT or ASL 2.0: rust-mime 0.3.16 -MIT or ASL 2.0: rust-minimal-lexical 0.2.1 -MIT or ASL 2.0: rust-num-traits 0.2.15 -MIT or ASL 2.0: rust-once_cell 1.13.0 -MIT or ASL 2.0: rust-os_str_bytes 6.1.0 -MIT or ASL 2.0: rust-proc-macro-error 1.0.4 -MIT or ASL 2.0: rust-proc-macro-error-attr 1.0.4 -MIT or ASL 2.0: rust-proc-macro2 1.0.40 -MIT or ASL 2.0: rust-quote 1.0.20 -MIT or ASL 2.0: rust-serde 1.0.139 -MIT or ASL 2.0: rust-serde_derive 1.0.139 -MIT or ASL 2.0: rust-syn 1.0.98 -MIT or ASL 2.0: rust-unicase 2.6.0 -MIT or ASL 2.0: rust-unicode-ident 1.0.1 -MIT or ASL 2.0: rust-version_check 0.9.4 -MIT: rust-atty 0.2.14 -MIT: rust-bincode 1.3.3 -MIT: rust-mime_guess 2.0.3 -MIT: rust-nix 0.24.1 -MIT: rust-nom 7.1.1 -MIT: rust-ordered-float 3.0.0 -MIT: rust-strsim 0.10.0 -MIT: rust-textwrap 0.15.0 -Unlicense or MIT: rust-memchr 2.5.0 -Unlicense or MIT: rust-termcolor 1.1.3 diff --git a/README.md b/README.md deleted file mode 100644 index 1638982..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-zoxide - -The rust-zoxide package \ No newline at end of file diff --git a/rust-zoxide.spec b/rust-zoxide.spec index ea4b871..816ab56 100644 --- a/rust-zoxide.spec +++ b/rust-zoxide.spec @@ -1,43 +1,46 @@ -# Generated by rust2rpm 22 -# * missing dev-dependency: rstest +# Generated by rust2rpm 24 +# * missing dev-dependencies: rstest ^0.16, rstest_reuse ^0.4 %bcond_with check %global crate zoxide Name: rust-zoxide -Version: 0.8.3 +Version: 0.9.0 Release: %autorelease Summary: Smarter cd command for your terminal License: MIT URL: https://crates.io/crates/zoxide -Source0: %{crates_source} -Source1: LICENSE.dependencies +Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: zoxide-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes # * drop incompatible compiler flag settings (strip = true, debug = 0) Patch: zoxide-fix-metadata.diff -ExclusiveArch: %{rust_arches} - BuildRequires: rust-packaging >= 21 %global _description %{expand: -Smarter cd command for your terminal.} +A smarter cd command for your terminal.} %description %{_description} %package -n %{crate} Summary: %{summary} -# ASL 2.0 or MIT -# CC0 + +# (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# CC0-1.0 OR MIT-0 # MIT -# MIT or ASL 2.0 -# Unlicense or MIT -License: MIT and CC0 +# MIT OR Apache-2.0 +# Unlicense OR MIT +License: MIT AND MIT-0 AND Unicode-DFS-2016 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown +# recommend fuzzy finder for interactive completions +Recommends: fzf + %description -n %{crate} %{_description} %files -n %{crate} @@ -47,17 +50,12 @@ License: MIT and CC0 %doc README.md %{_bindir}/zoxide %{_mandir}/man1/%{crate}*.1* -%{_datadir}/bash-completion/completions/%{crate} -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/_%{crate} -%dir %{_datadir}/fish -%dir %{_datadir}/fish/vendor_completions.d -%{_datadir}/fish/vendor_completions.d/%{crate}.fish +%{bash_completions_dir}/%{crate}.bash +%{fish_completions_dir}/%{crate}.fish +%{zsh_completions_dir}/_%{crate} %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 -cp %{SOURCE1} . %cargo_prep %generate_buildrequires @@ -72,15 +70,18 @@ echo '/usr/bin/zsh' %build %cargo_build +# write license summary and breakdown +%cargo_license_summary +%{cargo_license} > LICENSE.dependencies %install %cargo_install -# Install manpages +# install manpages install -Dpm 644 man/man1/%{crate}*.1 -t %{buildroot}%{_mandir}/man1/ -# Install shell completions -install -Dpm 644 contrib/completions/%{crate}.bash %{buildroot}%{_datadir}/bash-completion/completions/%{crate} -install -Dpm 644 contrib/completions/_%{crate} -t %{buildroot}%{_datadir}/zsh/site-functions/ -install -Dpm 644 contrib/completions/%{crate}.fish -t %{buildroot}/%{_datadir}/fish/vendor_completions.d/ +# install shell completions +install -Dpm 644 contrib/completions/%{crate}.bash -t %{buildroot}/%{bash_completions_dir}/ +install -Dpm 644 contrib/completions/%{crate}.fish -t %{buildroot}/%{fish_completions_dir}/ +install -Dpm 644 contrib/completions/_%{crate} -t %{buildroot}/%{zsh_completions_dir}/ %if %{with check} %check diff --git a/sources b/sources index abd58fc..4bfeadc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zoxide-0.8.3.crate) = 62d7181f5199f0c21df3e4387eeb56c77c50c02453fc3fd5cab0c4cc954a9f932618415c1e0a4ff2c3e6b484e231b1e44ad47c7b432ca2617885e99af94873b8 +SHA512 (zoxide-0.9.0.crate) = 916db51fcef2a605e7dc942a6f534c5588af0c24fd278e5053da8ba2e48945f123b950dbb8fabc470fbd33dc109cccfa83a50ea012618983dac7634790456939 diff --git a/zoxide-fix-metadata-auto.diff b/zoxide-fix-metadata-auto.diff index f5d572f..692906b 100644 --- a/zoxide-fix-metadata-auto.diff +++ b/zoxide-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- zoxide-0.8.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zoxide-0.8.3/Cargo.toml 1970-01-01T00:00:01+00:00 -@@ -148,8 +148,5 @@ +--- zoxide-0.9.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zoxide-0.9.0/Cargo.toml 2023-04-19T14:54:52.893929+00:00 +@@ -147,8 +147,5 @@ ] default-features = false diff --git a/zoxide-fix-metadata.diff b/zoxide-fix-metadata.diff index a234915..c94f61c 100644 --- a/zoxide-fix-metadata.diff +++ b/zoxide-fix-metadata.diff @@ -1,12 +1,31 @@ ---- zoxide-0.8.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zoxide-0.8.3/Cargo.toml 2022-11-01T07:55:41.313146+00:00 -@@ -79,9 +79,6 @@ - +--- zoxide-0.9.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zoxide-0.9.0/Cargo.toml 2023-04-19T14:55:15.175976+00:00 +@@ -76,8 +76,6 @@ [profile.release] lto = true --codegen-units = 1 + codegen-units = 1 -debug = 0 -strip = true [dependencies.anyhow] version = "1.0.32" +@@ -112,19 +110,6 @@ + version = "1.0.116" + features = ["derive"] + +-[dev-dependencies.assert_cmd] +-version = "2.0.0" +- +-[dev-dependencies.rstest] +-version = "0.16.0" +-default-features = false +- +-[dev-dependencies.rstest_reuse] +-version = "0.4.0" +- +-[dev-dependencies.tempfile] +-version = "3.1.0" +- + [build-dependencies.clap] + version = "4.0.0" + features = ["derive"]