diff --git a/0001-macros-remove-Cargo.lock.patch b/0001-macros-remove-Cargo.lock.patch index c86f872..435710c 100644 --- a/0001-macros-remove-Cargo.lock.patch +++ b/0001-macros-remove-Cargo.lock.patch @@ -1,7 +1,7 @@ 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 +Subject: [PATCH 1/2] macros: remove Cargo.lock cargo-package automatically strips it out, but we package also some things directly from git. diff --git a/0002-macros-remove-spurious-whitespace.patch b/0002-macros-remove-spurious-whitespace.patch new file mode 100644 index 0000000..522e2b0 --- /dev/null +++ b/0002-macros-remove-spurious-whitespace.patch @@ -0,0 +1,28 @@ +From cd6329635329fc7742a18f7ed0933298a0c56cf7 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Tue, 9 Jan 2018 06:52:36 +0100 +Subject: [PATCH 2/2] macros: remove spurious whitespace + +Fixes: https://pagure.io/fedora-rust/rust2rpm/issue/48 +Reported-by: Josh Stone +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 288554c..67b1950 100644 +--- a/data/macros.cargo ++++ b/data/macros.cargo +@@ -27,7 +27,7 @@ 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 \ +-- +2.15.1 + diff --git a/rust-packaging.spec b/rust-packaging.spec index af03432..20d6cc3 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -2,13 +2,14 @@ Name: rust-packaging Version: 5 -Release: 2%{?dist} +Release: 3%{?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 +Patch0002: 0002-macros-remove-spurious-whitespace.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch @@ -86,6 +87,9 @@ py.test-%{python3_version} -v test.py %{python3_sitelib}/rust2rpm/ %changelog +* Tue Jan 09 2018 Igor Gnatenko - 5-3 +- Fix syntax error + * Tue Jan 09 2018 Igor Gnatenko - 5-2 - Remove Cargo.lock