diff --git a/.gitignore b/.gitignore index 33364db..cf6da3e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /clap-2.33.3.crate /clap-3.0.0-beta.2.crate /clap-3.0.0-beta.5.crate +/clap-3.0.10.crate diff --git a/clap-fix-metadata.diff b/clap-fix-metadata.diff deleted file mode 100644 index ae61002..0000000 --- a/clap-fix-metadata.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- clap-3.0.0-beta.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ clap-3.0.0-beta.5/Cargo.toml 2021-11-15T18:51:50.326098+00:00 -@@ -35,14 +35,6 @@ - - [lib] - bench = false -- --[[example]] --name = "busybox" --path = "examples/24a_multicall_busybox.rs" -- --[[example]] --name = "hostname" --path = "examples/24b_multicall_hostname.rs" - - [[bench]] - name = "01_default" -@@ -96,7 +88,7 @@ - optional = true - - [dependencies.os_str_bytes] --version = "4.1" -+version = "5" - - [dependencies.regex] - version = "1.0" diff --git a/rust-clap.spec b/rust-clap.spec index c641409..fba2926 100644 --- a/rust-clap.spec +++ b/rust-clap.spec @@ -1,14 +1,12 @@ -# Generated by rust2rpm 18 -# error: ran out of registers during register allocation -%ifnarch %{ix86} -%bcond_without check -%endif +# Generated by rust2rpm 20 +# * outdated / missing dev-dependencies (trycmd) +%bcond_with check %global debug_package %{nil} %global crate clap Name: rust-%{crate} -Version: 3.0.0~beta.5 +Version: 3.0.10 Release: %autorelease Summary: Simple to use, efficient, and full-featured Command Line Argument Parser @@ -16,15 +14,8 @@ 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 -# * Remove examples not provided in the crate -# * Bump os_str_bytes to 5 -Patch0: clap-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -39,10 +30,11 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +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}/ @@ -52,8 +44,8 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +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 @@ -64,8 +56,8 @@ BuildArch: noarch %description -n %{name}+atty-devel %{_description} -This package contains library source intended for building other packages -which use "atty" feature of "%{crate}" crate. +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 @@ -76,8 +68,8 @@ BuildArch: noarch %description -n %{name}+backtrace-devel %{_description} -This package contains library source intended for building other packages -which use "backtrace" feature of "%{crate}" crate. +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 @@ -88,8 +80,8 @@ BuildArch: noarch %description -n %{name}+cargo-devel %{_description} -This package contains library source intended for building other packages -which use "cargo" feature of "%{crate}" crate. +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 @@ -100,8 +92,8 @@ BuildArch: noarch %description -n %{name}+clap_derive-devel %{_description} -This package contains library source intended for building other packages -which use "clap_derive" feature of "%{crate}" crate. +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 @@ -112,8 +104,8 @@ BuildArch: noarch %description -n %{name}+color-devel %{_description} -This package contains library source intended for building other packages -which use "color" feature of "%{crate}" crate. +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 @@ -124,8 +116,8 @@ BuildArch: noarch %description -n %{name}+debug-devel %{_description} -This package contains library source intended for building other packages -which use "debug" feature of "%{crate}" crate. +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 @@ -136,8 +128,8 @@ BuildArch: noarch %description -n %{name}+derive-devel %{_description} -This package contains library source intended for building other packages -which use "derive" feature of "%{crate}" crate. +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 @@ -148,8 +140,8 @@ BuildArch: noarch %description -n %{name}+env-devel %{_description} -This package contains library source intended for building other packages -which use "env" feature of "%{crate}" crate. +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 @@ -160,8 +152,8 @@ BuildArch: noarch %description -n %{name}+lazy_static-devel %{_description} -This package contains library source intended for building other packages -which use "lazy_static" feature of "%{crate}" crate. +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 @@ -172,8 +164,8 @@ 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. +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 @@ -184,8 +176,8 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +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 @@ -196,8 +188,8 @@ BuildArch: noarch %description -n %{name}+strsim-devel %{_description} -This package contains library source intended for building other packages -which use "strsim" feature of "%{crate}" crate. +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 @@ -208,8 +200,8 @@ BuildArch: noarch %description -n %{name}+suggestions-devel %{_description} -This package contains library source intended for building other packages -which use "suggestions" feature of "%{crate}" crate. +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 @@ -220,8 +212,8 @@ BuildArch: noarch %description -n %{name}+termcolor-devel %{_description} -This package contains library source intended for building other packages -which use "termcolor" feature of "%{crate}" crate. +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 @@ -232,8 +224,8 @@ BuildArch: noarch %description -n %{name}+terminal_size-devel %{_description} -This package contains library source intended for building other packages -which use "terminal_size" feature of "%{crate}" crate. +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 @@ -244,8 +236,8 @@ BuildArch: noarch %description -n %{name}+unicase-devel %{_description} -This package contains library source intended for building other packages -which use "unicase" feature of "%{crate}" crate. +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 @@ -256,20 +248,44 @@ BuildArch: noarch %description -n %{name}+unicode-devel %{_description} -This package contains library source intended for building other packages -which use "unicode" feature of "%{crate}" crate. +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 +%package -n %{name}+unstable-doc-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+unstable-doc-devel %{_description} + +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 + +%package -n %{name}+unstable-grouped-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+unstable-grouped-devel %{_description} + +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 + %package -n %{name}+unstable-multicall-devel Summary: %{summary} BuildArch: noarch %description -n %{name}+unstable-multicall-devel %{_description} -This package contains library source intended for building other packages -which use "unstable-multicall" feature of "%{crate}" crate. +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 @@ -280,8 +296,8 @@ BuildArch: noarch %description -n %{name}+unstable-replace-devel %{_description} -This package contains library source intended for building other packages -which use "unstable-replace" feature of "%{crate}" crate. +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 @@ -292,8 +308,8 @@ BuildArch: noarch %description -n %{name}+wrap_help-devel %{_description} -This package contains library source intended for building other packages -which use "wrap_help" feature of "%{crate}" crate. +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 @@ -304,8 +320,8 @@ BuildArch: noarch %description -n %{name}+yaml-devel %{_description} -This package contains library source intended for building other packages -which use "yaml" feature of "%{crate}" crate. +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 @@ -316,8 +332,8 @@ BuildArch: noarch %description -n %{name}+yaml-rust-devel %{_description} -This package contains library source intended for building other packages -which use "yaml-rust" feature of "%{crate}" crate. +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 @@ -337,11 +353,11 @@ which use "yaml-rust" feature of "%{crate}" crate. %if %{with check} %check -%ifnarch aarch64 +# * work around LLVM codegen issues when compiling doctests on i686: +# https://bugzilla.redhat.com/show_bug.cgi?id=2020861 +%ifnarch %{ix86} %cargo_test %else -# rustdoc fails to compile some doctests on aarch64 -# https://bugzilla.redhat.com/show_bug.cgi?id=1902663 %cargo_test -- --lib %endif %endif diff --git a/sources b/sources index a2ef7c1..f4c559d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clap-3.0.0-beta.5.crate) = bac8e4064c0c39b2a964cd0bc5fef85cbae4dc42dde37e7f52d19d08971f5d0062f33dd55926e3058aa4b3884cba785062438faf0a40bc817fd83cff92315a94 +SHA512 (clap-3.0.10.crate) = df152686241d9298b7f0838ad8151bf09a57076105af90ea6cd161c730f7ca978c9046dd3fb34005e0c8b84227bd768e3b5f8969a2cc28b158c84e69892a870f