Regenerate with rust2rpm v24

README.md

@@ -1,3 +0,0 @@
-# rust-zram-generator
-
-The rust-zram-generator package

rust-zram-generator.spec

@@ -1,4 +1,4 @@
-# Generated by rust2rpm 19
+# Generated by rust2rpm 24
 %bcond_without check
 
 # RHEL does not have packages for Rust dependencies
@@ -10,30 +10,28 @@
 
 %global crate zram-generator
 
-Name:           rust-%{crate}
+Name:           rust-zram-generator
 Version:        1.1.2
 Release:        %autorelease
 Summary:        Systemd unit generator for zram swap devices
 
-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/zram-generator
-Source:         %{crates_source}
+Source0:        %{crates_source}
 Source1:        zram-generator.conf
 # To create the vendor tarball:
 #   tar xf %%{crate}-%%{version}.crate ; pushd %%{crate}-%%{version} ; \
 #   cargo vendor && tar Jcvf ../%%{crate}-%%{version}-vendor.tar.xz vendor/ ; popd
 Source2:        %{crate}-%{version}-vendor.tar.xz
 
-ExclusiveArch:  %{rust_arches}
-
 %if 0%{?bundled_rust_deps}
 BuildRequires:  rust-toolset
 BuildRequires:  make
 BuildRequires:  /usr/bin/ronn
+BuildRequires:  pkgconfig(systemd)
 BuildRequires:  systemd-rpm-macros
 %else
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 %endif
 
 %global _description %{expand:
@@ -47,15 +45,17 @@ To activate, install %{crate}-defaults subpackage.}
 
 %package     -n %{crate}
 Summary:        %{summary}
+# Apache-2.0 OR MIT
 # MIT
-# MIT or ASL 2.0
+# MIT OR Apache-2.0
-License:        MIT
+License:        MIT AND (Apache-2.0 OR MIT)
 Recommends:     %{_sbindir}/zramctl
 
 %description -n %{crate} %{_description}
 
 %files       -n %{crate}
 %license LICENSE
+%license LICENSE.dependencies
 %doc zram-generator.conf.example
 %doc README.md
 %{_systemdgeneratordir}/zram-generator
@@ -86,9 +86,9 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE
+%license %{crate_instdir}/LICENSE
-%doc README.md
+%doc %{crate_instdir}/README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -96,11 +96,11 @@ BuildArch:      noarch
 
 %description -n %{name}+default-devel %{_description}
 
-This package contains library source intended for building other packages
+This package contains library source intended for building other packages which
-which use "default" feature of "%{crate}" crate.
+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
 %endif
 
 %prep
@@ -115,6 +115,7 @@ cp -a %{S:1} .
 %cargo_generate_buildrequires
 echo '/usr/bin/make'
 echo '/usr/bin/ronn'
+echo 'pkgconfig(systemd)'
 echo 'systemd-rpm-macros'
 %endif
 
@@ -122,6 +123,8 @@ echo 'systemd-rpm-macros'
 export SYSTEMD_UTIL_DIR=%{_systemd_util_dir}
 export LC_ALL=C.UTF-8
 %cargo_build
+%{?cargo_license_summary}
+%{?cargo_license} > LICENSE.dependencies
 %make_build SYSTEMD_SYSTEM_UNIT_DIR=%{_unitdir} SYSTEMD_SYSTEM_GENERATOR_DIR=%{_systemdgeneratordir} \
   systemd-service man