Fix installed file paths

This commit is contained in:
John Baublitz 2021-05-12 11:37:35 -04:00
parent 4f07c7998d
commit 4747cb7bb3

View File

@ -10,7 +10,7 @@
Name: stratisd Name: stratisd
Version: 2.4.0 Version: 2.4.0
Release: 1%{?dist} Release: 3%{?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
@ -41,6 +41,7 @@ BuildRequires: pkgconfig(blkid) >= 2.32.0
BuildRequires: rust-packaging BuildRequires: rust-packaging
%endif %endif
BuildRequires: systemd BuildRequires: systemd
BuildRequires: dracut
%{?systemd_requires} %{?systemd_requires}
Requires: xfsprogs Requires: xfsprogs
@ -104,12 +105,12 @@ mv %{buildroot}%{udevdir}/stratis_utils %{buildroot}%{udevdir}/stratis-str-cmp
ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/stratis-base32-decode ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/stratis-base32-decode
ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_bindir}/stratis-predict-usage ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_bindir}/stratis-predict-usage
mkdir -p %{buildroot}%{_unitdir}/system-generators mkdir -p %{buildroot}%{_systemdgeneratordir}
ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_unitdir}/system-generators/stratis-clevis-setup-generator ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/stratis-clevis-setup-generator
ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_unitdir}/system-generators/stratis-setup-generator ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/stratis-setup-generator
install -Dpm0755 -t %{buildroot}%{_bindir} target/release/stratis-min install -Dpm0755 -t %{buildroot}%{_bindir} target/release/stratis-min
install -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd-min install -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd-min
install -Dpm0755 -t %{buildroot}%{_usr}/lib/systemd systemd/stratis-fstab-setup install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup
%if %{with check} %if %{with check}
@ -148,13 +149,16 @@ install -Dpm0755 -t %{buildroot}%{_usr}/lib/systemd systemd/stratis-fstab-setup
%{dracutdir}/modules.d/90stratis/stratisd-min.service %{dracutdir}/modules.d/90stratis/stratisd-min.service
%{_unitdir}/stratisd-min-postinitrd.service %{_unitdir}/stratisd-min-postinitrd.service
%{_unitdir}/stratis-fstab-setup@.service %{_unitdir}/stratis-fstab-setup@.service
%{_unitdir}/system-generators/stratis-clevis-setup-generator %{_systemdgeneratordir}/stratis-clevis-setup-generator
%{_unitdir}/system-generators/stratis-setup-generator %{_systemdgeneratordir}/stratis-setup-generator
%{_bindir}/stratis-min %{_bindir}/stratis-min
%{_libexecdir}/stratisd-min %{_libexecdir}/stratisd-min
%{_usr}/lib/systemd/stratis-fstab-setup %{_systemd_util_dir}/stratis-fstab-setup
%changelog %changelog
* Wed May 12 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.0-3
- Fix installed file paths
* Tue Apr 27 2021 mulhern <amulhern@redhat.com> - 2.4.0-2 * Tue Apr 27 2021 mulhern <amulhern@redhat.com> - 2.4.0-2
- Fixes to previous release - Fixes to previous release