From e45a825b21fbb7ba51fcb9fd73f6adcb046a3491 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: May 11 2022 14:06:53 +0000 Subject: Update to version 4.2.5; Fixes RHBZ#2066079 --- diff --git a/.gitignore b/.gitignore index 3afb47e..322fa22 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /which-4.1.0.crate /which-4.2.2.crate /which-4.2.4.crate +/which-4.2.5.crate diff --git a/rust-which.spec b/rust-which.spec index 04d86c4..b810c3b 100644 --- a/rust-which.spec +++ b/rust-which.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate which Name: rust-%{crate} -Version: 4.2.4 +Version: 4.2.5 Release: %autorelease Summary: Rust equivalent of Unix command "which" @@ -19,7 +19,7 @@ Patch0: which-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Rust equivalent of Unix command "which". Locate installed executable in cross @@ -37,9 +37,9 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE.txt -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE.txt +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -51,7 +51,7 @@ This package contains library source intended for building other packages which use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+regex-devel Summary: %{summary} @@ -63,7 +63,7 @@ This package contains library source intended for building other packages which use the "regex" feature of the "%{crate}" crate. %files -n %{name}+regex-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 3643ac0..0a46b09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (which-4.2.4.crate) = 9ca2bbec727040197fc12efdc7cd70bc94bd1b4abd03bf86f6043fd960de73053b84c7d101d897563583b8d6d85377025e1e7213640987ebdfdd54fa629e3b80 +SHA512 (which-4.2.5.crate) = 2b2b44773b568946799035e5b90c1f0c304b399f4d330c1e063323f631f56ddc6c5d8a9d026d987cb39c801ccbfb614450064030fc19e1de34ab6a495f053395 diff --git a/which-fix-metadata.diff b/which-fix-metadata.diff index 5cd2d21..80e31fe 100644 --- a/which-fix-metadata.diff +++ b/which-fix-metadata.diff @@ -1,8 +1,8 @@ ---- which-4.2.4/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ which-4.2.4/Cargo.toml 2022-01-26T16:07:08.721479+00:00 +--- which-4.2.5/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ which-4.2.5/Cargo.toml 2022-03-29T12:23:24.476015+00:00 @@ -34,5 +34,3 @@ optional = true - [dev-dependencies.tempdir] - version = "0.3.7" + [dev-dependencies.tempfile] + version = "3.3.0" -[target."cfg(windows)".dependencies.lazy_static] --version = "1" +-version = "1.4.0"