diff --git a/.gitignore b/.gitignore index ef06754..632cc92 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /indicatif-0.14.0.crate /indicatif-0.15.0.crate /indicatif-0.16.2.crate +/indicatif-0.17.3.crate diff --git a/indicatif-fix-metadata.diff b/indicatif-fix-metadata.diff new file mode 100644 index 0000000..4eb689b --- /dev/null +++ b/indicatif-fix-metadata.diff @@ -0,0 +1,11 @@ +--- indicatif-0.17.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ indicatif-0.17.3/Cargo.toml 2023-01-20T05:12:25.067446+00:00 +@@ -45,7 +45,7 @@ + version = "0.4" + + [dependencies.portable-atomic] +-version = "0.3.15" ++version = "1" + + [dependencies.rayon] + version = "1.1" diff --git a/rust-indicatif.spec b/rust-indicatif.spec index c66ed3f..6290fd0 100644 --- a/rust-indicatif.spec +++ b/rust-indicatif.spec @@ -1,22 +1,22 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 23 %bcond_without check %global debug_package %{nil} %global crate indicatif -Name: rust-%{crate} -Version: 0.16.2 +Name: rust-indicatif +Version: 0.17.3 Release: %autorelease Summary: Progress bar and cli reporting library for Rust -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/indicatif Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * bump portable-atomic to 1 +Patch: indicatif-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Progress bar and cli reporting library for Rust.} @@ -33,9 +33,9 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -47,7 +47,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}+improved_unicode-devel Summary: %{summary} @@ -59,7 +59,19 @@ This package contains library source intended for building other packages which use the "improved_unicode" feature of the "%{crate}" crate. %files -n %{name}+improved_unicode-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+in_memory-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+in_memory-devel %{_description} + +This package contains library source intended for building other packages which +use the "in_memory" feature of the "%{crate}" crate. + +%files -n %{name}+in_memory-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rayon-devel Summary: %{summary} @@ -71,7 +83,19 @@ This package contains library source intended for building other packages which use the "rayon" feature of the "%{crate}" crate. %files -n %{name}+rayon-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+tokio-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+tokio-devel %{_description} + +This package contains library source intended for building other packages which +use the "tokio" feature of the "%{crate}" crate. + +%files -n %{name}+tokio-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unicode-segmentation-devel Summary: %{summary} @@ -83,7 +107,7 @@ This package contains library source intended for building other packages which use the "unicode-segmentation" feature of the "%{crate}" crate. %files -n %{name}+unicode-segmentation-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unicode-width-devel Summary: %{summary} @@ -95,19 +119,19 @@ This package contains library source intended for building other packages which use the "unicode-width" feature of the "%{crate}" crate. %files -n %{name}+unicode-width-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+with_rayon-devel +%package -n %{name}+vt100-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+with_rayon-devel %{_description} +%description -n %{name}+vt100-devel %{_description} This package contains library source intended for building other packages which -use the "with_rayon" feature of the "%{crate}" crate. +use the "vt100" feature of the "%{crate}" crate. -%files -n %{name}+with_rayon-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+vt100-devel +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index d15d867..c53c2c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (indicatif-0.16.2.crate) = 5f60358f1fe3ffc0ec97d1d8922a7a2645d7dc0affed1d49a9205becdb36756d6a03482ef00fc918231770f967f7fc523f7b8c3bf4c06f71a0a93549c46fdacd +SHA512 (indicatif-0.17.3.crate) = 9d536106cb5435f6944ad78fbbcad2dd15763f7efbd78a21da452ab6fe939bed8fa565909aa6db12f738035cd1417ddfbfba2c2a10ec14b8fb464acaf7356c39