From 138603f9ead720f619ff7c9ddd3915afeeb4f929 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 22 Nov 2019 18:35:54 -0800 Subject: [PATCH] Update to 2.0.2 --- .gitignore | 1 + 0001-chore-Update-glob-to-0.3.patch | 26 -------------------------- rust-wild.spec | 12 ++++++------ sources | 2 +- wild-fix-metadata.diff | 13 ------------- 5 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 0001-chore-Update-glob-to-0.3.patch delete mode 100644 wild-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 6b4612a..b1545f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /wild-2.0.1.crate +/wild-2.0.2.crate diff --git a/0001-chore-Update-glob-to-0.3.patch b/0001-chore-Update-glob-to-0.3.patch deleted file mode 100644 index 556061f..0000000 --- a/0001-chore-Update-glob-to-0.3.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7a4f0e5e89ca1a5082c4a2c2f77ec7a91ae44343 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Tue, 7 May 2019 12:14:35 +0000 -Subject: [PATCH] chore: Update glob to 0.3 - -Signed-off-by: Igor Gnatenko ---- - src/argsiter.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/argsiter.rs b/src/argsiter.rs -index 760ac76..bbe17ed 100644 ---- a/src/argsiter.rs -+++ b/src/argsiter.rs -@@ -44,7 +44,7 @@ impl Iterator for ArgsOs { - Some(ref mut args) => match args.next() { - // lossy: https://github.com/rust-lang-nursery/glob/issues/23 - Some(arg) => if arg.contains_glob { -- match glob::glob_with(&arg.pattern.to_string_lossy(), &glob_options) { -+ match glob::glob_with(&arg.pattern.to_string_lossy(), glob_options) { - Ok(mut glob_iter) => { - let first_glob = first_non_error(&mut glob_iter); - self.current_arg_globs = Some(glob_iter); --- -2.21.0 - diff --git a/rust-wild.spec b/rust-wild.spec index de3ee68..485dc60 100644 --- a/rust-wild.spec +++ b/rust-wild.spec @@ -5,21 +5,17 @@ %global crate wild Name: rust-%{crate} -Version: 2.0.1 -Release: 6%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Glob (wildcard) expanded command-line arguments # Upstream license specification: MIT -# https://gitlab.com/kornelski/wild/issues/2 License: MIT URL: https://crates.io/crates/wild Source: %{crates_source} # Initial patched metadata # * No windows -# * Update glob to 0.3, https://gitlab.com/kornelski/wild/merge_requests/2 Patch0: wild-fix-metadata.diff -# Make it work with new glob -Patch1: 0001-chore-Update-glob-to-0.3.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -43,6 +39,7 @@ This package contains library source intended for building other packages which use "%{crate}" crate. %files devel +%license LICENSE %doc README.md %{cargo_registry}/%{crate}-%{version}/ @@ -77,6 +74,9 @@ which use "default" feature of "%{crate}" crate. %endif %changelog +* Sat Nov 23 2019 Josh Stone - 2.0.2-1 +- Update to 2.0.2 + * Fri Jul 26 2019 Fedora Release Engineering - 2.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index d8175f9..51a0ad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wild-2.0.1.crate) = 001f83176ab74b1ebff70fa63bcb93d66aee8eb7519d917af3ba894a208b2346da38ff278b26b11affde90755530ea707918c9476e3b0c72951d23bcb1677ec9 +SHA512 (wild-2.0.2.crate) = 31f9169b77127c1fb20dcb29cd6b0eeeaa5654086d65db2eae5ffe744e3ffec8de98927caea21f699ec79a1f040d6891070ef7f2e99aba5fee79c13e77ca9f80 diff --git a/wild-fix-metadata.diff b/wild-fix-metadata.diff deleted file mode 100644 index f298221..0000000 --- a/wild-fix-metadata.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- wild-2.0.1/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ wild-2.0.1/Cargo.toml 2019-05-07T12:13:33.827001+00:00 -@@ -23,9 +23,7 @@ - license = "MIT" - repository = "https://gitlab.com/kornelski/wild" - [dev-dependencies.glob] --version = "0.2.11" --[target."cfg(windows)".dependencies.glob] --version = "0.2.11" -+version = "0.3" - [badges.appveyor] - repository = "pornel/wild" -