diff --git a/0001-macros-remove-Cargo.lock.patch b/0001-macros-remove-Cargo.lock.patch new file mode 100644 index 0000000..c86f872 --- /dev/null +++ b/0001-macros-remove-Cargo.lock.patch @@ -0,0 +1,31 @@ +From 5313b352712486b4001827b04d906bdb91be2314 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 8 Jan 2018 23:57:03 +0100 +Subject: [PATCH] macros: remove Cargo.lock + +cargo-package automatically strips it out, but we package also some +things directly from git. + +Acked-by: Josh Stone +Signed-off-by: Igor Gnatenko +--- + data/macros.cargo | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/data/macros.cargo b/data/macros.cargo +index ebf3edb..288554c 100644 +--- a/data/macros.cargo ++++ b/data/macros.cargo +@@ -27,7 +27,8 @@ directory = "%{cargo_registry}"\ + [source.crates-io]\ + registry = "https://crates.io"\ + replace-with = "local-registry"\ +-EOF\ ++EOF \ ++%{__rm} -f Cargo.lock \ + %if ! %{with check} \ + # https://github.com/rust-lang/cargo/issues/3732 \ + %{__awk} -i inplace -v INPLACE_SUFFIX=.orig '/^\\\[dev-dependencies/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml \ +-- +2.15.1 + diff --git a/rust-packaging.spec b/rust-packaging.spec index 651c352..af03432 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -2,12 +2,13 @@ Name: rust-packaging Version: 5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM macros for building Rust packages on various architectures License: MIT URL: https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz +Patch0001: 0001-macros-remove-Cargo.lock.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch @@ -85,6 +86,9 @@ py.test-%{python3_version} -v test.py %{python3_sitelib}/rust2rpm/ %changelog +* Tue Jan 09 2018 Igor Gnatenko - 5-2 +- Remove Cargo.lock + * Mon Jan 08 2018 Igor Gnatenko - 5-1 - Update to 5