diff --git a/.gitignore b/.gitignore index 42cf490..c5a1268 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/which-4.4.2.crate +SOURCES/which-5.0.0.crate diff --git a/.rust-which.metadata b/.rust-which.metadata index 85e3f38..2e276aa 100644 --- a/.rust-which.metadata +++ b/.rust-which.metadata @@ -1 +1 @@ -260d05a1fd105ad4974272d2e9deae224fd5ec2b SOURCES/which-4.4.2.crate +99d9d6521c3500ad50eb0997367cee04f1d88330 SOURCES/which-5.0.0.crate diff --git a/SOURCES/which-fix-metadata-auto.diff b/SOURCES/which-fix-metadata-auto.diff index c377313..ae7418f 100644 --- a/SOURCES/which-fix-metadata-auto.diff +++ b/SOURCES/which-fix-metadata-auto.diff @@ -1,8 +1,15 @@ ---- which-4.4.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ which-4.4.2/Cargo.toml 2023-09-17T14:56:27.053730+00:00 -@@ -55,5 +55,3 @@ +--- which-5.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ which-5.0.0/Cargo.toml 2024-01-19T17:09:47.141117+00:00 +@@ -55,12 +55,3 @@ [target."cfg(any(windows, unix, target_os = \"redox\"))".dependencies.home] version = "0.5.5" -[target."cfg(windows)".dependencies.once_cell] -version = "1" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Storage_FileSystem", +- "Win32_Foundation", +-] diff --git a/SOURCES/which-fix-metadata.diff b/SOURCES/which-fix-metadata.diff new file mode 100644 index 0000000..786a751 --- /dev/null +++ b/SOURCES/which-fix-metadata.diff @@ -0,0 +1,11 @@ +--- which-5.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ which-5.0.0/Cargo.toml 2024-01-19T17:09:56.591155+00:00 +@@ -38,7 +38,7 @@ + version = "1.6.1" + + [dependencies.regex] +-version = "= 1.9.6" ++version = "1.9.6" + optional = true + + [dependencies.rustix] diff --git a/SPECS/rust-which.spec b/SPECS/rust-which.spec index c6001da..235205a 100644 --- a/SPECS/rust-which.spec +++ b/SPECS/rust-which.spec @@ -1,5 +1,5 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.3.5) +## (rpmautospec version 0.5.1) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: release_number = 1; @@ -8,24 +8,27 @@ }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate which Name: rust-which -Version: 4.4.2 +Version: 5.0.0 Release: %autorelease Summary: Rust equivalent of Unix command "which" License: MIT URL: https://crates.io/crates/which Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies +# Automatically generated patch to strip dependencies and normalize metadata Patch: which-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# * relax dependency on the "regex" crate from =1.9.6 to ^1.9.6 +Patch: which-fix-metadata.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: A Rust equivalent of Unix command "which". Locate installed executable @@ -73,7 +76,7 @@ use the "regex" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -91,6 +94,10 @@ use the "regex" feature of the "%{crate}" crate. %endif %changelog +## START: Generated by rpmautospec +* Fri Jan 19 2024 Fabio Valentini - 5.0.0-1 +- Update to version 5.0.0 + * Mon Jan 15 2024 Arkady L. Shane - 4.4.2-1 - Rebuilt for MSVSphere 9.3 @@ -191,3 +198,4 @@ use the "regex" feature of the "%{crate}" crate. * Wed Nov 29 2017 Igor Gnatenko - 1.0.3-1 - Initial package +## END: Generated by rpmautospec