Merge remote-tracking branch 'origin/master' into f32

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>

rust-zram-generator.spec

@@ -1,5 +1,8 @@
 # Generated by rust2rpm 15
 %bcond_without check
+# No devel stuff in released Fedora
+%global __cargo_skip_build 0
+%global __cargo_is_lib() false
 
 %global crate zram-generator
 
@@ -15,9 +18,6 @@ Source:         %{crates_source}
 Source1:        zram-generator.conf
 
 ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
 
 BuildRequires:  rust-packaging
 BuildRequires:  systemd-rpm-macros
@@ -31,7 +31,6 @@ To activate, install %{crate}-defaults subpackage.}
 
 %description %{_description}
 
-%if ! %{__cargo_skip_build}
 %package     -n %{crate}
 Summary:        %{summary}
 # MIT
@@ -60,33 +59,6 @@ BuildArch:      noarch
 
 %files       -n %{crate}-defaults
 %{_prefix}/lib/systemd/zram-generator.conf
-%endif
-
-%package        devel
-Summary:        %{SUMMARY}
-BuildArch:      noarch
-
-%description    devel %{_description}
-
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
-
-%files          devel
-%license LICENSE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
-
-%package     -n %{name}+default-devel
-Summary:        %{SUMMARY}
-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.
-
-%files       -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1