diff --git a/.gitignore b/.gitignore index 04f570a..644669c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /password-hash-0.3.2.crate +/password-hash-0.4.2.crate diff --git a/password-hash-fix-metadata.diff b/password-hash-fix-metadata.diff deleted file mode 100644 index 29d62a4..0000000 --- a/password-hash-fix-metadata.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- password-hash-0.3.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ password-hash-0.3.2/Cargo.toml 2021-12-13T17:22:30.987558+00:00 -@@ -25,7 +25,7 @@ - all-features = true - rustc-args = ["--cfg", "docsrs"] - [dependencies.base64ct] --version = ">=1, <1.1.0" -+version = "1" - - [dependencies.rand_core] - version = "0.6" -@@ -33,7 +33,7 @@ - default-features = false - - [dependencies.subtle] --version = ">=2, <2.5" -+version = "2" - default-features = false - - [features] diff --git a/rust-password-hash.spec b/rust-password-hash.spec index cb78530..71561a3 100644 --- a/rust-password-hash.spec +++ b/rust-password-hash.spec @@ -1,30 +1,24 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate password-hash -Name: rust-%{crate} -Version: 0.3.2 +Name: rust-password-hash +Version: 0.4.2 Release: %autorelease -Summary: Traits which describe password hashing algorithms +Summary: Traits which describe the functionality of password hashing algorithms, as well as a no_std-friendly implementation of the PHC string format -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/password-hash Source: %{crates_source} -# Initial patched metadata -# * relax base64ct and subtle dependencies (MSRV is irrelevant in Fedora) -Patch0: password-hash-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Traits which describe the functionality of password hashing algorithms, as well -as a `no_std`-friendly implementation of the PHC string format (a well-defined -subset of the Modular Crypt Format a.k.a. MCF).} +Traits which describe the functionality of password hashing algorithms, +as well as a `no_std`-friendly implementation of the PHC string format +(a well-defined subset of the Modular Crypt Format a.k.a. MCF).} %description %{_description} @@ -38,9 +32,11 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc CHANGELOG.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -52,7 +48,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}+alloc-devel Summary: %{summary} @@ -64,7 +60,7 @@ This package contains library source intended for building other packages which use the "alloc" feature of the "%{crate}" crate. %files -n %{name}+alloc-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rand_core-devel Summary: %{summary} @@ -76,7 +72,7 @@ This package contains library source intended for building other packages which use the "rand_core" feature of the "%{crate}" crate. %files -n %{name}+rand_core-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -88,7 +84,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 %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 4ae4cf4..64bbc86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (password-hash-0.3.2.crate) = 157cf50896c28d5a73670fe2ea9e00ceb10acd3d2c9abb13b86f0b16d3fd8c56767d5732cb997b52702432b0c25d4591d1263e24c312d0fef25a328ea0dd940d +SHA512 (password-hash-0.4.2.crate) = f6b7da81fa172ed37229894c426965182be1a445ccaba4351b91ce43ff1ab8cacd205b321721df49dd43ba17dc6a77e9b7cccc3a0c396572aa7ad642af44926d