From 0a59d8fef55c83ce5d9e16df36c875574066699a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: May 11 2022 13:12:46 +0000 Subject: Update to version 3.1.18; Fixes RHBZ#2059315 --- diff --git a/.gitignore b/.gitignore index 67efd4e..8d65acd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /clap-3.0.10.crate /clap-3.0.14.crate /clap-3.1.2.crate +/clap-3.1.18.crate diff --git a/clap-fix-metadata.diff b/clap-fix-metadata.diff new file mode 100644 index 0000000..8e1a812 --- /dev/null +++ b/clap-fix-metadata.diff @@ -0,0 +1,10 @@ +--- clap-3.1.18/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ clap-3.1.18/Cargo.toml 2022-05-11T13:03:42.456663+00:00 +@@ -35,6 +35,7 @@ + categories = ["command-line-interface"] + license = "MIT OR Apache-2.0" + repository = "https://github.com/clap-rs/clap" ++autobins = false + + [package.metadata.docs.rs] + features = ["unstable-doc"] diff --git a/rust-clap.spec b/rust-clap.spec index 6587a41..c7f59d3 100644 --- a/rust-clap.spec +++ b/rust-clap.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm 20 -# * outdated / missing dev-dependencies (trycmd) +# Generated by rust2rpm 21 +# * missing dev-dependencies: snapbox, trycmd %bcond_with check %global debug_package %{nil} %global crate clap Name: rust-%{crate} -Version: 3.1.2 +Version: 3.1.18 Release: %autorelease Summary: Simple to use, efficient, and full-featured Command Line Argument Parser @@ -14,10 +14,13 @@ Summary: Simple to use, efficient, and full-featured Command Line Argumen License: MIT or ASL 2.0 URL: https://crates.io/crates/clap Source: %{crates_source} +# Initial patched metadata +# * disable building a test fixture binary +Patch0: clap-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Simple to use, efficient, and full-featured Command Line Argument Parser.} @@ -34,9 +37,10 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -48,7 +52,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}+atty-devel Summary: %{summary} @@ -60,7 +64,7 @@ This package contains library source intended for building other packages which use the "atty" feature of the "%{crate}" crate. %files -n %{name}+atty-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+backtrace-devel Summary: %{summary} @@ -72,7 +76,7 @@ This package contains library source intended for building other packages which use the "backtrace" feature of the "%{crate}" crate. %files -n %{name}+backtrace-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+cargo-devel Summary: %{summary} @@ -84,7 +88,7 @@ This package contains library source intended for building other packages which use the "cargo" feature of the "%{crate}" crate. %files -n %{name}+cargo-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+clap_derive-devel Summary: %{summary} @@ -96,7 +100,7 @@ This package contains library source intended for building other packages which use the "clap_derive" feature of the "%{crate}" crate. %files -n %{name}+clap_derive-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+color-devel Summary: %{summary} @@ -108,7 +112,7 @@ This package contains library source intended for building other packages which use the "color" feature of the "%{crate}" crate. %files -n %{name}+color-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+debug-devel Summary: %{summary} @@ -120,7 +124,7 @@ This package contains library source intended for building other packages which use the "debug" feature of the "%{crate}" crate. %files -n %{name}+debug-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+derive-devel Summary: %{summary} @@ -132,7 +136,7 @@ This package contains library source intended for building other packages which use the "derive" feature of the "%{crate}" crate. %files -n %{name}+derive-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+env-devel Summary: %{summary} @@ -144,7 +148,7 @@ This package contains library source intended for building other packages which use the "env" feature of the "%{crate}" crate. %files -n %{name}+env-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+lazy_static-devel Summary: %{summary} @@ -156,7 +160,7 @@ This package contains library source intended for building other packages which use the "lazy_static" feature of the "%{crate}" crate. %files -n %{name}+lazy_static-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+regex-devel Summary: %{summary} @@ -168,7 +172,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 %package -n %{name}+std-devel Summary: %{summary} @@ -180,7 +184,7 @@ This package contains library source intended for building other packages which use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+strsim-devel Summary: %{summary} @@ -192,7 +196,7 @@ This package contains library source intended for building other packages which use the "strsim" feature of the "%{crate}" crate. %files -n %{name}+strsim-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+suggestions-devel Summary: %{summary} @@ -204,7 +208,7 @@ This package contains library source intended for building other packages which use the "suggestions" feature of the "%{crate}" crate. %files -n %{name}+suggestions-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+termcolor-devel Summary: %{summary} @@ -216,7 +220,7 @@ This package contains library source intended for building other packages which use the "termcolor" feature of the "%{crate}" crate. %files -n %{name}+termcolor-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+terminal_size-devel Summary: %{summary} @@ -228,7 +232,7 @@ This package contains library source intended for building other packages which use the "terminal_size" feature of the "%{crate}" crate. %files -n %{name}+terminal_size-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unicase-devel Summary: %{summary} @@ -240,7 +244,7 @@ This package contains library source intended for building other packages which use the "unicase" feature of the "%{crate}" crate. %files -n %{name}+unicase-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unicode-devel Summary: %{summary} @@ -252,7 +256,7 @@ This package contains library source intended for building other packages which use the "unicode" feature of the "%{crate}" crate. %files -n %{name}+unicode-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unstable-doc-devel Summary: %{summary} @@ -264,7 +268,7 @@ This package contains library source intended for building other packages which use the "unstable-doc" feature of the "%{crate}" crate. %files -n %{name}+unstable-doc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unstable-grouped-devel Summary: %{summary} @@ -276,7 +280,7 @@ This package contains library source intended for building other packages which use the "unstable-grouped" feature of the "%{crate}" crate. %files -n %{name}+unstable-grouped-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unstable-multicall-devel Summary: %{summary} @@ -288,7 +292,7 @@ This package contains library source intended for building other packages which use the "unstable-multicall" feature of the "%{crate}" crate. %files -n %{name}+unstable-multicall-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unstable-replace-devel Summary: %{summary} @@ -300,7 +304,19 @@ This package contains library source intended for building other packages which use the "unstable-replace" feature of the "%{crate}" crate. %files -n %{name}+unstable-replace-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+unstable-v4-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+unstable-v4-devel %{_description} + +This package contains library source intended for building other packages which +use the "unstable-v4" feature of the "%{crate}" crate. + +%files -n %{name}+unstable-v4-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+wrap_help-devel Summary: %{summary} @@ -312,7 +328,7 @@ This package contains library source intended for building other packages which use the "wrap_help" feature of the "%{crate}" crate. %files -n %{name}+wrap_help-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+yaml-devel Summary: %{summary} @@ -324,7 +340,7 @@ This package contains library source intended for building other packages which use the "yaml" feature of the "%{crate}" crate. %files -n %{name}+yaml-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+yaml-rust-devel Summary: %{summary} @@ -336,7 +352,7 @@ This package contains library source intended for building other packages which use the "yaml-rust" feature of the "%{crate}" crate. %files -n %{name}+yaml-rust-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 c6b9354..ced5ff8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clap-3.1.2.crate) = eb921a5735a4a6c74e411a168f3e99b1926565e5280365ef208f536a50c178cbcdd5de6a0da05e6799d1e2d7ae886fcf387e0d83fa821bc7538c659c9fa79ef3 +SHA512 (clap-3.1.18.crate) = bd06202304e04cdbe12e7532ff9f112e0cd3c8fbab00232149eaf9f296acc308b18d2a7e7926c22f1c39db92a2af140b39eeb7affeb30226d9a9cd73dff41b39