diff --git a/.gitignore b/.gitignore index 64ffc58..f9e7240 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /femme-2.1.1.crate +/femme-2.2.1.crate diff --git a/femme-fix-metadata.diff b/femme-fix-metadata.diff index ad6d588..bb88cf1 100644 --- a/femme-fix-metadata.diff +++ b/femme-fix-metadata.diff @@ -1,9 +1,10 @@ ---- femme-2.1.1/Cargo.toml 2020-08-10T13:59:21+00:00 -+++ femme-2.1.1/Cargo.toml 2021-04-28T23:38:02.172034+00:00 -@@ -38,13 +38,3 @@ - version = "1.0.56" +--- femme-2.2.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ femme-2.2.1/Cargo.toml 2022-05-11T13:54:26.460265+00:00 +@@ -52,14 +52,3 @@ + [dev-dependencies.kv-log-macro] version = "1.0.5" +- -[target."cfg(target_arch = \"wasm32\")".dependencies.js-sys] -version = "0.3.25" - diff --git a/rust-femme.spec b/rust-femme.spec index 260abd6..d73076b 100644 --- a/rust-femme.spec +++ b/rust-femme.spec @@ -1,13 +1,13 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 21 %bcond_without check %global debug_package %{nil} %global crate femme Name: rust-%{crate} -Version: 2.1.1 +Version: 2.2.1 Release: %autorelease -Summary: Pretty-printer and ndjson logger for log crate +Summary: Pretty-printer and ndjson logger for the log crate # Upstream license specification: MIT OR Apache-2.0 License: MIT or ASL 2.0 @@ -18,14 +18,12 @@ Source: %{crates_source} Patch0: femme-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Not just a pretty (inter)face: pretty-printer and ndjson logger for log crate.} +Not just a pretty (inter)face: pretty-printer and ndjson logger for the log +crate.} %description %{_description} @@ -35,13 +33,14 @@ 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}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -49,11 +48,11 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index e63b7c5..70216b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (femme-2.1.1.crate) = 0c0b70f22f01ecb92751d7d3d945f31efba47ba8c5e61c6a92d71ba99e09b229f114681860c2525beaafc0382f2261e863cb10bd298834d1fc4e4609a4945d64 +SHA512 (femme-2.2.1.crate) = b1fa5b9b5c346325b3bbcf7b968a26d7b372e21a2f461f5aa63e07f04716e9d8e8b6b36846379c8403e81785105e781dae5aa580395e2cc7d38f4ad90c769c54