Skip to content

Commit

Permalink
rpm-ostree.spec.in: Update rust macro usage
Browse files Browse the repository at this point in the history
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 upstreams the contribution from yselkowitz on Fedora:
https://src.fedoraproject.org/fork/yselkowitz/rpms/rpm-ostree/c/6a9a20578f547f2fc0ce7801797cab076afa0873
  • Loading branch information
jmarrero committed Apr 16, 2024
1 parent e387c14 commit 6015fde
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions packaging/rpm-ostree.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,11 @@ export RUSTFLAGS="%{build_rustflags}"
%{?with_rhsm:--enable-featuresrs=rhsm}

%make_build
%if 0%{?fedora} || 0%{?rhel} >= 10
%cargo_license_summary
%{cargo_license} > LICENSE.dependencies
%cargo_vendor_manifest
%endif

%install
%make_install INSTALL="install -p -c"
Expand Down Expand Up @@ -253,6 +258,10 @@ fi
%doc COPYING.GPL COPYING.LGPL LICENSE README.md

%files libs -f files.lib
%if 0%{?fedora} || 0%{?rhel} >= 10
%license LICENSE.dependencies
%license cargo-vendor.txt
%endif

%files devel -f files.devel

Expand Down

0 comments on commit 6015fde

Please sign in to comment.