Update Rust macro usage
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:
parent
c6e0f62622
commit
8cadddf84d
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
Name: rust-%{crate}
|
Name: rust-%{crate}
|
||||||
Version: 0.1.4
|
Version: 0.1.4
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: sshd AuthorizedKeysCommand to read ~/.ssh/authorized_keys.d
|
Summary: sshd AuthorizedKeysCommand to read ~/.ssh/authorized_keys.d
|
||||||
|
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -45,6 +45,10 @@ Requires(postun): systemd
|
|||||||
%{_libexecdir}/ssh-key-dir
|
%{_libexecdir}/ssh-key-dir
|
||||||
%config(noreplace) %{_sysconfdir}/ssh/sshd_config.d/40-ssh-key-dir.conf
|
%config(noreplace) %{_sysconfdir}/ssh/sshd_config.d/40-ssh-key-dir.conf
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
%license LICENSE.dependencies
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%license cargo-vendor.txt
|
||||||
|
%endif
|
||||||
%doc README.md
|
%doc README.md
|
||||||
|
|
||||||
%post -n %{crate}
|
%post -n %{crate}
|
||||||
@ -56,9 +60,9 @@ if [ $1 == 0 ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{crate}-%{version_no_tilde} -p1
|
%autosetup -n %{crate}-%{version_no_tilde} -p1 %{?rhel:-a1}
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%cargo_prep -V 1
|
%cargo_prep -v vendor
|
||||||
%else
|
%else
|
||||||
%cargo_prep
|
%cargo_prep
|
||||||
%endif
|
%endif
|
||||||
@ -70,6 +74,11 @@ fi
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
%cargo_build
|
%cargo_build
|
||||||
|
%cargo_license_summary
|
||||||
|
%{cargo_license} > LICENSE.dependencies
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%cargo_vendor_manifest
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
@ -86,6 +95,9 @@ install -Dpm0644 -t %{buildroot}%{_sysconfdir}/ssh/sshd_config.d conf/40-ssh-key
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 02 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 0.1.4-7
|
||||||
|
- Update Rust macro usage
|
||||||
|
|
||||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-6
|
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user