Use vendored dependency in RHEL builds

RHEL does not ship individual Rust package dependencies.
This commit is contained in:
Yaakov Selkowitz 2023-05-15 20:13:52 -04:00
parent b94403eac9
commit 820c5ec20c
3 changed files with 26 additions and 0 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/zram-generator-1.1.0.crate /zram-generator-1.1.0.crate
/zram-generator-1.1.1.crate /zram-generator-1.1.1.crate
/zram-generator-1.1.2.crate /zram-generator-1.1.2.crate
/zram-generator-1.1.2-vendor.tar.xz

View File

@ -1,6 +1,13 @@
# Generated by rust2rpm 19 # Generated by rust2rpm 19
%bcond_without check %bcond_without check
# RHEL does not have packages for Rust dependencies
%if 0%{?rhel}
%global bundled_rust_deps 1
%else
%global bundled_rust_deps 0
%endif
%global crate zram-generator %global crate zram-generator
Name: rust-%{crate} Name: rust-%{crate}
@ -13,10 +20,21 @@ License: MIT
URL: https://crates.io/crates/zram-generator URL: https://crates.io/crates/zram-generator
Source: %{crates_source} Source: %{crates_source}
Source1: zram-generator.conf 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} ExclusiveArch: %{rust_arches}
%if 0%{?bundled_rust_deps}
BuildRequires: rust-toolset
BuildRequires: make
BuildRequires: /usr/bin/ronn
BuildRequires: systemd-rpm-macros
%else
BuildRequires: rust-packaging BuildRequires: rust-packaging
%endif
%global _description %{expand: %global _description %{expand:
This is a systemd unit generator that enables swap on zram. This is a systemd unit generator that enables swap on zram.
@ -57,6 +75,7 @@ BuildArch: noarch
%files -n %{crate}-defaults %files -n %{crate}-defaults
%{_prefix}/lib/systemd/zram-generator.conf %{_prefix}/lib/systemd/zram-generator.conf
%if ! 0%{?bundled_rust_deps}
%package devel %package devel
Summary: %{summary} Summary: %{summary}
BuildArch: noarch BuildArch: noarch
@ -82,10 +101,14 @@ which use "default" feature of "%{crate}" crate.
%files -n %{name}+default-devel %files -n %{name}+default-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%endif
%prep %prep
%autosetup -n %{crate}-%{version_no_tilde} -p1 %autosetup -n %{crate}-%{version_no_tilde} -p1
cp -a %{S:1} . cp -a %{S:1} .
%if 0%{?bundled_rust_deps}
%cargo_prep -V 2
%else
%cargo_prep %cargo_prep
%generate_buildrequires %generate_buildrequires
@ -93,6 +116,7 @@ cp -a %{S:1} .
echo '/usr/bin/make' echo '/usr/bin/make'
echo '/usr/bin/ronn' echo '/usr/bin/ronn'
echo 'systemd-rpm-macros' echo 'systemd-rpm-macros'
%endif
%build %build
export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} export SYSTEMD_UTIL_DIR=%{_systemd_util_dir}

View File

@ -1 +1,2 @@
SHA512 (zram-generator-1.1.2.crate) = dfad7d4384eb4635c33475e4571d33a3135c92cf42138dd1cb50f19aef4b3f2465130783e385a3f544e43a1653273cee9b2d8f45177a8b053acf37805dc939c8 SHA512 (zram-generator-1.1.2.crate) = dfad7d4384eb4635c33475e4571d33a3135c92cf42138dd1cb50f19aef4b3f2465130783e385a3f544e43a1653273cee9b2d8f45177a8b053acf37805dc939c8
SHA512 (zram-generator-1.1.2-vendor.tar.xz) = 0d628fd3543ea2351d628a0fb61603cb838050050b1766a4c8c45e5de3a6513d724ca4d97081e112cf8accb9c23045a2b0a3de556374020bedb87ead310e9cf2