rpms/virtiofsd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Rust macro usage

Browse Source 
The rust-toolset macros in RHEL 10 are now compatible with Fedora's
in terms of handling vendoring and automatic generation of license
information and bundled provides.
This commit is contained in:
Yaakov Selkowitz 2024-02-01 13:38:04 -05:00
parent 7bcbaae2de
commit 9088584d5a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
virtiofsd.spec
View File

@ -1,6 +1,6 @@
Name: virtiofsd Name: virtiofsd
Version: 1.10.0 Version: 1.10.0
Release: 2%{?dist} Release: 2%{?dist}.1
Summary: Virtio-fs vhost-user device daemon (Rust version) Summary: Virtio-fs vhost-user device daemon (Rust version)
License: Apache-2.0 AND BSD-3-Clause License: Apache-2.0 AND BSD-3-Clause
@ -38,9 +38,9 @@ Provides: qemu-virtiofsd = 2:7.2.1-1
%{summary}. %{summary}.
%prep %prep
%autosetup -n %{name}-%{version_no_tilde} -p1 %autosetup -n %{name}-%{version_no_tilde} -p1 %{?rhel:-a1}
%if 0%{?rhel} %if 0%{?rhel}
%cargo_prep -V 1 %cargo_prep -v vendor
rm -f Cargo.lock rm -f Cargo.lock
%else %else
%cargo_prep %cargo_prep
@ -51,6 +51,11 @@ rm -f Cargo.lock
%build %build
%cargo_build %cargo_build
%cargo_license_summary
%{cargo_license} > LICENSE.dependencies
%if 0%{?rhel}
%cargo_vendor_manifest
%endif
%install %install
mkdir -p %{buildroot}%{_libexecdir} mkdir -p %{buildroot}%{_libexecdir}
@ -59,11 +64,18 @@ install -D -p -m 0644 50-virtiofsd.json %{buildroot}%{_datadir}/qemu/vhost-user/
%files %files
%license LICENSE-APACHE LICENSE-BSD-3-Clause %license LICENSE-APACHE LICENSE-BSD-3-Clause
%license LICENSE.dependencies
%if 0%{?rhel}
%license cargo-vendor.txt
%endif
%doc README.md %doc README.md
%{_libexecdir}/virtiofsd %{_libexecdir}/virtiofsd
%{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json %{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json
%changelog %changelog
* Thu Feb 01 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.10.0-2.1
- Update Rust macro usage
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild