From 3d81dfb791e228064d17e1c4313b12b3ae8aab41 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 20 May 2023 17:32:29 +0200 Subject: [PATCH] Regenerate with rust2rpm v24 --- .rust2rpm.conf | 4 --- README.md | 3 --- lazycell-fix-metadata.diff | 17 ++++++++++++ rust-lazycell.spec | 55 +++++++++++++++----------------------- 4 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 .rust2rpm.conf delete mode 100644 README.md create mode 100644 lazycell-fix-metadata.diff diff --git a/.rust2rpm.conf b/.rust2rpm.conf deleted file mode 100644 index 1e979c6..0000000 --- a/.rust2rpm.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -unwanted-features = - clippy - nightly-testing diff --git a/README.md b/README.md deleted file mode 100644 index cda95d1..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-lazycell - -The rust-lazycell package \ No newline at end of file diff --git a/lazycell-fix-metadata.diff b/lazycell-fix-metadata.diff new file mode 100644 index 0000000..3ae0f02 --- /dev/null +++ b/lazycell-fix-metadata.diff @@ -0,0 +1,17 @@ +--- lazycell-1.3.0/Cargo.toml 2020-08-12T01:11:22+00:00 ++++ lazycell-1.3.0/Cargo.toml 2023-05-20T15:31:35.228099+00:00 +@@ -21,14 +21,7 @@ + keywords = ["lazycell", "lazy", "cell", "library"] + license = "MIT/Apache-2.0" + repository = "https://github.com/indiv0/lazycell" +-[dependencies.clippy] +-version = "0.0" +-optional = true + + [dependencies.serde] + version = "^1" + optional = true +- +-[features] +-nightly = [] +-nightly-testing = ["clippy", "nightly"] diff --git a/rust-lazycell.spec b/rust-lazycell.spec index b1956f5..01feeaa 100644 --- a/rust-lazycell.spec +++ b/rust-lazycell.spec @@ -1,28 +1,27 @@ -# Generated by rust2rpm 16 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate lazycell -Name: rust-%{crate} +Name: rust-lazycell Version: 1.3.0 Release: %autorelease Summary: Library providing a lazily filled Cell struct # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/lazycell Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * remove dependency on the obsolete clippy crate +# * remove nightly-only features +Patch: lazycell-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Library providing a lazily filled Cell struct.} +A library providing a lazily filled Cell struct.} %description %{_description} @@ -32,13 +31,15 @@ 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-MIT LICENSE-APACHE -%doc README.md CHANGELOG.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} @@ -46,23 +47,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 - -%package -n %{name}+nightly-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+nightly-devel %{_description} - -This package contains library source intended for building other packages -which use "nightly" feature of "%{crate}" crate. - -%files -n %{name}+nightly-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+serde-devel Summary: %{summary} @@ -70,11 +59,11 @@ BuildArch: noarch %description -n %{name}+serde-devel %{_description} -This package contains library source intended for building other packages -which use "serde" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "serde" feature of the "%{crate}" crate. %files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1