diff --git a/0001-Ignore-Cargo.lock.patch b/0001-Ignore-Cargo.lock.patch new file mode 100644 index 0000000..3f719f5 --- /dev/null +++ b/0001-Ignore-Cargo.lock.patch @@ -0,0 +1,26 @@ +From 308b1b98e5a7724572325293bdc19ac167877544 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sun, 18 Aug 2019 16:39:13 +0200 +Subject: [PATCH] Ignore Cargo.lock + +Signed-off-by: Igor Gnatenko +--- + data/macros.cargo | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/macros.cargo b/data/macros.cargo +index 1182850..5f60111 100644 +--- a/data/macros.cargo ++++ b/data/macros.cargo +@@ -90,7 +90,7 @@ if %__cargo_is_lib; then \ + # so that cargo doesn't fail resolving dependencies: \ + # https://github.com/rust-lang/cargo/pull/6729 \ + %{__awk} -i inplace -v INPLACE_SUFFIX=.deps '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml \ +- %{__cargo} package -l | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \ ++ %{__cargo} package -l | grep -w -v Cargo.lock | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \ + %{__mv} Cargo.toml{.deps,} \ + %{__cp} -a Cargo.toml $REG_DIR/Cargo.toml \ + %{__rm} -f $REG_DIR/Cargo.toml.{orig,deps} \ +-- +2.23.0.rc2 + diff --git a/rust-packaging.spec b/rust-packaging.spec index 8456e7f..6ce0682 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -1,11 +1,10 @@ %bcond_without check -%{?python_enable_dependency_generator} # https://pagure.io/koji/issue/659 %global debug_package %{nil} Name: rust-packaging Version: 10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RPM macros for building Rust packages on various architectures License: MIT @@ -13,6 +12,8 @@ URL: https://pagure.io/fedora-rust/rust2rpm Source: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz # TODO: See if we can manage to keep using inplace feature Patch0001: 0001-macros-Do-not-use-awk-s-inplace-feature.patch +# https://pagure.io/fedora-rust/rust2rpm/issue/90 +Patch0002: 0001-Ignore-Cargo.lock.patch ExclusiveArch: %{rust_arches} @@ -73,6 +74,9 @@ py.test-%{python3_version} -vv test.py %{python3_sitelib}/rust2rpm/ %changelog +* Sun Aug 18 2019 Igor Gnatenko - 10-4 +- Ignore Cargo.lock + * Fri Jul 26 2019 Fedora Release Engineering - 10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild