rpms/loupe
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 15:32:07 -05:00
parent 865705deaf
commit e484780324
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
loupe.spec
View File

@ -74,7 +74,9 @@ Features:
%prep %prep
%autosetup -p1 -n loupe-%{tarball_version} %autosetup -p1 -n loupe-%{tarball_version}
%if ! 0%{?bundled_rust_deps} %if 0%{?bundled_rust_deps}
%cargo_prep -v vendor
%else
rm -rf vendor rm -rf vendor
sed -i -e '/Cargo.lock/d' meson.build sed -i -e '/Cargo.lock/d' meson.build
%cargo_prep %cargo_prep
@ -91,9 +93,10 @@ sed -i -e '/Cargo.lock/d' meson.build
%meson %meson
%meson_build %meson_build
%if ! 0%{?rhel}
%cargo_license_summary %cargo_license_summary
%{cargo_license} > LICENSE.dependencies %{cargo_license} > LICENSE.dependencies
%if 0%{?bundled_rust_deps}
%cargo_vendor_manifest
%endif %endif
@ -114,8 +117,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Loupe.de
%files -f loupe.lang %files -f loupe.lang
%license COPYING.md %license COPYING.md
%if ! 0%{?rhel}
%license LICENSE.dependencies %license LICENSE.dependencies
%if 0%{?bundled_rust_deps}
%license cargo-vendor.txt
%endif %endif
%doc NEWS README.md %doc NEWS README.md
%{_bindir}/loupe %{_bindir}/loupe