Tidy up BuildRequires

This commit is contained in:
mulhern 2022-03-24 22:29:05 -04:00
parent c4f90253ab
commit c382fe1da0

View File

@ -1,11 +1,10 @@
# Generated by rust2rpm
%bcond_without check %bcond_without check
%global udevdir %(pkg-config --variable=udevdir udev) %global udevdir %(pkg-config --variable=udevdir udev)
%global dracutdir %(pkg-config --variable=dracutdir dracut) %global dracutdir %(pkg-config --variable=dracutdir dracut)
Name: stratisd Name: stratisd
Version: 3.0.4 Version: 3.0.4
Release: 7%{?dist} Release: 8%{?dist}
Summary: Daemon that manages block devices to create filesystems Summary: Daemon that manages block devices to create filesystems
# 0BSD or MIT or ASL 2.0 # 0BSD or MIT or ASL 2.0
@ -29,13 +28,15 @@ ExclusiveArch: %{rust_arches}
BuildRequires: rust-toolset BuildRequires: rust-toolset
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: dbus-devel BuildRequires: dbus-devel
BuildRequires: libblkid-devel
BuildRequires: cryptsetup-devel
BuildRequires: clang BuildRequires: clang
BuildRequires: /usr/bin/a2x
BuildRequires: pkgconfig(libcryptsetup) >= 2.3.0
BuildRequires: pkgconfig(blkid) >= 2.32.0
%else %else
BuildRequires: rust-packaging BuildRequires: rust-packaging
%endif %endif
BuildRequires: %{_bindir}/a2x
# Required to calculate install directories
BuildRequires: systemd BuildRequires: systemd
BuildRequires: dracut BuildRequires: dracut
@ -72,12 +73,8 @@ tar xvf %{SOURCE2} --strip-components=1
%cargo_prep -V 1 %cargo_prep -V 1
%else %else
%cargo_prep %cargo_prep
%generate_buildrequires %generate_buildrequires
%cargo_generate_buildrequires -f dbus_enabled,min,systemd_compat %cargo_generate_buildrequires -f dbus_enabled,min,systemd_compat
echo '/usr/bin/a2x'
echo 'pkgconfig(libcryptsetup) >= 2.3.0'
echo 'pkgconfig(blkid) >= 2.32.0'
%endif %endif
%build %build
@ -171,6 +168,9 @@ install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup
%{_systemdgeneratordir}/stratis-setup-generator %{_systemdgeneratordir}/stratis-setup-generator
%changelog %changelog
* Thu Mar 24 2022 mulhern <amulhern@redhat.com> - 3.0.4-8
- Tidy up BuildRequires
* Thu Mar 24 2022 mulhern <amulhern@redhat.com> - 3.0.4-7 * Thu Mar 24 2022 mulhern <amulhern@redhat.com> - 3.0.4-7
- Remove __cargo_skip_build - Remove __cargo_skip_build