From e82cfe127eaf22f445bf90bd041e00ab20acad17 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 31 Jul 2021 14:09:49 +0200 Subject: [PATCH] Update to version 4.2.2; Fixes RHBZ#1987293 --- .gitignore | 1 + rust-which.spec | 19 +++++++++++++++++-- sources | 2 +- which-fix-metadata.diff | 8 ++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 which-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 51b060c..13a3c8f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /which-3.1.1.crate /which-4.0.2.crate /which-4.1.0.crate +/which-4.2.2.crate diff --git a/rust-which.spec b/rust-which.spec index 4f72f8e..82b7d1d 100644 --- a/rust-which.spec +++ b/rust-which.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 18 %bcond_without check %global debug_package %{nil} %global crate which Name: rust-%{crate} -Version: 4.1.0 +Version: 4.2.2 Release: %autorelease Summary: Rust equivalent of Unix command "which" @@ -13,6 +13,9 @@ Summary: Rust equivalent of Unix command "which" License: MIT URL: https://crates.io/crates/which Source: %{crates_source} +# Initial patched metadata +# * drop windows-specific dependencies +Patch0: which-fix-metadata.diff ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -53,6 +56,18 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%package -n %{name}+regex-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+regex-devel %{_description} + +This package contains library source intended for building other packages +which use "regex" feature of "%{crate}" crate. + +%files -n %{name}+regex-devel +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep diff --git a/sources b/sources index 81db237..7bc3166 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (which-4.1.0.crate) = 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22 +SHA512 (which-4.2.2.crate) = 25fe54f3703d865bdda04a26720839d6cf52300558e1abdf339eec985cc085fc983ea44a3b36767ef56748c865d432b0105a9fbe677f4b4deee8ec0af9dda59c diff --git a/which-fix-metadata.diff b/which-fix-metadata.diff new file mode 100644 index 0000000..29e7883 --- /dev/null +++ b/which-fix-metadata.diff @@ -0,0 +1,8 @@ +--- which-4.2.2/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ which-4.2.2/Cargo.toml 2021-07-31T12:08:23.025616+00:00 +@@ -33,5 +33,3 @@ + optional = true + [dev-dependencies.tempdir] + version = "0.3.7" +-[target."cfg(windows)".dependencies.lazy_static] +-version = "1"