From 282431b1c674e4f2f1a3051abbe40b0d6c6f523f Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sat, 2 May 2020 19:17:22 +0200 Subject: [PATCH] Update to 14 Signed-off-by: Igor Raits --- .gitignore | 1 + ...rgo-install-no-track-with-cargo-1.41.patch | 37 ------------------- rust-packaging.spec | 10 ++--- sources | 2 +- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 0001-Use-cargo-install-no-track-with-cargo-1.41.patch diff --git a/.gitignore b/.gitignore index 1fa667d..64d05ef 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /rust2rpm-11.tar.xz /rust2rpm-12.tar.xz /rust2rpm-13.tar.xz +/rust2rpm-14.tar.xz diff --git a/0001-Use-cargo-install-no-track-with-cargo-1.41.patch b/0001-Use-cargo-install-no-track-with-cargo-1.41.patch deleted file mode 100644 index 95427f1..0000000 --- a/0001-Use-cargo-install-no-track-with-cargo-1.41.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b4581d8f5ba5e48de9a97988d95739b364222acd Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Thu, 30 Jan 2020 22:02:59 -0800 -Subject: [PATCH] Use `cargo install --no-track` with cargo 1.41 - -In cargo 1.41, `cargo install` adds a new `.crates2.json` file in the -install root for tracking version upgrades. This would be another file -that `%cargo_install` should remove afterward, but there is also a new -`--no-track` option which disables such metadata files altogether. - -This update should be coordinated with the Rust toolchain update in the -distro, e.g. with rust-packaging `Requires: cargo >= 1.41`. The new -option will be rejected as an unstable option on earlier versions. ---- - data/macros.cargo | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/macros.cargo b/data/macros.cargo -index 5f601114a893..a916699b806b 100644 ---- a/data/macros.cargo -+++ b/data/macros.cargo -@@ -101,11 +101,11 @@ fi \ - %{shrink:\ - %{__cargo} install \ - %{__cargo_common_opts} \ -+ --no-track \ - --path . \ - %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \ - %* \ - } \ -- %{__rm} %{buildroot}%{_prefix}/.crates.toml \ - fi \ - %endif \ - ) --- -2.24.1 - diff --git a/rust-packaging.spec b/rust-packaging.spec index 2c28984..bd954f3 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -3,17 +3,14 @@ %global debug_package %{nil} Name: rust-packaging -Version: 13 -Release: 3%{?dist} +Version: 14 +Release: 1%{?dist} Summary: RPM macros for building Rust packages on various architectures License: MIT URL: https://pagure.io/fedora-rust/rust2rpm Source: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz -# https://pagure.io/fedora-rust/rust2rpm/pull-request/107 -Patch1: 0001-Use-cargo-install-no-track-with-cargo-1.41.patch - ExclusiveArch: %{rust_arches} # gawk is needed for stripping dev-deps in macro @@ -72,6 +69,9 @@ py.test-%{python3_version} -vv test.py %{python3_sitelib}/rust2rpm/ %changelog +* Sat May 02 2020 Igor Raits - 14-1 +- Update to 14 + * Mon Feb 03 2020 Josh Stone - 13-3 - Use 'cargo install --no-track' with cargo 1.41 diff --git a/sources b/sources index ab8f1d8..b2f766b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rust2rpm-13.tar.xz) = 48eb5eb5fa574b9c0df8b4feac963e873c15ed4f347023326e0809bff6afbd2c3ad9848e43e678d7bc4314c2f2231dbac8ddacb70d1370c134e3597e2b8f7cfc +SHA512 (rust2rpm-14.tar.xz) = 2710843103e1c44a0816f25720a0e711bf0a6beafacdb37f2828d4f1eae7959f0768952d33eb6dc295b9f5adaf383d814e553a20e27e359c0a1afc69b8d063e5