diff --git a/lazycell-fix-metadata.diff b/lazycell-fix-metadata.diff
deleted file mode 100644
index 40b8ff0..0000000
--- a/lazycell-fix-metadata.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- lazycell-1.2.0/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ lazycell-1.2.0/Cargo.toml	2018-11-04T17:10:09.098108+01:00
-@@ -21,10 +21,3 @@
- keywords = ["lazycell", "lazy", "cell", "library"]
- license = "MIT/Apache-2.0"
- repository = "https://github.com/indiv0/lazycell"
--[dependencies.clippy]
--version = "0.0"
--optional = true
--
--[features]
--nightly = []
--nightly-testing = ["clippy", "nightly"]
diff --git a/rust-lazycell.spec b/rust-lazycell.spec
index 95db916..825886c 100644
--- a/rust-lazycell.spec
+++ b/rust-lazycell.spec
@@ -1,29 +1,28 @@
-# Generated by rust2rpm
-# * Tests are run in infrastructure
-%bcond_with check
+# Generated by rust2rpm 10
+%bcond_without check
 %global debug_package %{nil}
 
 %global crate lazycell
 
 Name:           rust-%{crate}
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Library providing a lazily filled Cell struct
 
 # Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/lazycell
-Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
-# Initial patched metadata
-# * clippy is nightly
-Patch0:         lazycell-fix-metadata.diff
+Source:         %{crates_source}
 
 ExclusiveArch:  %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch:      noarch
+%endif
 
 BuildRequires:  rust-packaging
 
-%global _description \
-A library providing a lazily filled Cell struct.
+%global _description %{expand:
+Library providing a lazily filled Cell struct.}
 
 %description %{_description}
 
@@ -53,10 +52,49 @@ which use "default" feature of "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
+%package     -n %{name}+clippy-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+clippy-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "clippy" feature of "%{crate}" crate.
+
+%files       -n %{name}+clippy-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/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}/Cargo.toml
+
+%package     -n %{name}+nightly-testing-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+nightly-testing-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "nightly-testing" feature of "%{crate}" crate.
+
+%files       -n %{name}+nightly-testing-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
+%generate_buildrequires
+%cargo_generate_buildrequires
+
 %build
 %cargo_build
 
@@ -69,6 +107,9 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Sat Jun 22 20:05:35 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.1-4
+- Initial package
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild