From c382fe1da086b05e133dfb0ee871223419e7b746 Mon Sep 17 00:00:00 2001 From: mulhern Date: Thu, 24 Mar 2022 22:29:05 -0400 Subject: [PATCH] Tidy up BuildRequires --- stratisd.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/stratisd.spec b/stratisd.spec index 9c0f3fb..9a7cc32 100644 --- a/stratisd.spec +++ b/stratisd.spec @@ -1,11 +1,10 @@ -# Generated by rust2rpm %bcond_without check %global udevdir %(pkg-config --variable=udevdir udev) %global dracutdir %(pkg-config --variable=dracutdir dracut) Name: stratisd Version: 3.0.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Daemon that manages block devices to create filesystems # 0BSD or MIT or ASL 2.0 @@ -29,13 +28,15 @@ ExclusiveArch: %{rust_arches} BuildRequires: rust-toolset BuildRequires: systemd-devel BuildRequires: dbus-devel +BuildRequires: libblkid-devel +BuildRequires: cryptsetup-devel BuildRequires: clang -BuildRequires: /usr/bin/a2x -BuildRequires: pkgconfig(libcryptsetup) >= 2.3.0 -BuildRequires: pkgconfig(blkid) >= 2.32.0 %else BuildRequires: rust-packaging %endif +BuildRequires: %{_bindir}/a2x + +# Required to calculate install directories BuildRequires: systemd BuildRequires: dracut @@ -72,12 +73,8 @@ tar xvf %{SOURCE2} --strip-components=1 %cargo_prep -V 1 %else %cargo_prep - %generate_buildrequires %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 %build @@ -171,6 +168,9 @@ install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup %{_systemdgeneratordir}/stratis-setup-generator %changelog +* Thu Mar 24 2022 mulhern - 3.0.4-8 +- Tidy up BuildRequires + * Thu Mar 24 2022 mulhern - 3.0.4-7 - Remove __cargo_skip_build