From f206878cfba2362834756f72db638a457e81770e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 16 Mar 2023 21:47:13 +0100 Subject: [PATCH] Update to version 2.3.3; Fixes RHBZ#2179020 --- .gitignore | 1 + README.md | 3 --- rust-walkdir.spec | 34 +++++++++++++++------------------- sources | 2 +- walkdir-fix-metadata-auto.diff | 12 ++++++++++++ walkdir-fix-metadata.diff | 15 --------------- 6 files changed, 29 insertions(+), 38 deletions(-) delete mode 100644 README.md create mode 100644 walkdir-fix-metadata-auto.diff delete mode 100644 walkdir-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 2a1bf3a..35b331b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /walkdir-2.2.9.crate /walkdir-2.3.1.crate /walkdir-2.3.2.crate +/walkdir-2.3.3.crate diff --git a/README.md b/README.md deleted file mode 100644 index ce2f581..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-walkdir - -The rust-walkdir package \ No newline at end of file diff --git a/rust-walkdir.spec b/rust-walkdir.spec index d1015a6..22ff2d4 100644 --- a/rust-walkdir.spec +++ b/rust-walkdir.spec @@ -1,28 +1,22 @@ -# Generated by rust2rpm 19 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate walkdir -Name: rust-%{crate} -Version: 2.3.2 +Name: rust-walkdir +Version: 2.3.3 Release: %autorelease Summary: Recursively walk a directory # Upstream license specification: Unlicense/MIT -License: Unlicense or MIT +License: Unlicense OR MIT URL: https://crates.io/crates/walkdir Source: %{crates_source} -# Initial patched metadata -# * No windows -Patch0: walkdir-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: walkdir-fix-metadata-auto.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Recursively walk a directory.} @@ -36,12 +30,14 @@ BuildArch: noarch %description devel %{_description} This package contains library source intended for building other packages which -use "%{crate}" crate. +use the "%{crate}" crate. %files devel -%license COPYING LICENSE-MIT UNLICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/COPYING +%license %{crate_instdir}/LICENSE-MIT +%license %{crate_instdir}/UNLICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,10 +46,10 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} This package contains library source intended for building other packages which -use "the default" feature of the "%{crate}" crate. +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 %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 504c163..b539bf0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (walkdir-2.3.2.crate) = 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da +SHA512 (walkdir-2.3.3.crate) = 2b6e1e27c16e310f636eb1c9ee58435509fb8f7a6c5beba4dd13d87aa1d91599a593bfe720a675d536ce63e217c31e240a57122455d8e18de1282a9e7fc3defe diff --git a/walkdir-fix-metadata-auto.diff b/walkdir-fix-metadata-auto.diff new file mode 100644 index 0000000..de4e912 --- /dev/null +++ b/walkdir-fix-metadata-auto.diff @@ -0,0 +1,12 @@ +--- walkdir-2.3.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ walkdir-2.3.3/Cargo.toml 2023-03-16T20:45:44.125060+00:00 +@@ -39,9 +39,6 @@ + [dev-dependencies.doc-comment] + version = "0.3" + +-[target."cfg(windows)".dependencies.winapi-util] +-version = "0.1.1" +- + [badges.appveyor] + repository = "BurntSushi/walkdir" + diff --git a/walkdir-fix-metadata.diff b/walkdir-fix-metadata.diff deleted file mode 100644 index 7519bfe..0000000 --- a/walkdir-fix-metadata.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- walkdir-2.3.2/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ walkdir-2.3.2/Cargo.toml 2021-03-23T18:20:35.064437+00:00 -@@ -28,12 +28,7 @@ - version = "1.0.1" - [dev-dependencies.doc-comment] - version = "0.3" --[target."cfg(windows)".dependencies.winapi] --version = "0.3" --features = ["std", "winnt"] - --[target."cfg(windows)".dependencies.winapi-util] --version = "0.1.1" - [badges.appveyor] - repository = "BurntSushi/walkdir" -