From 003845290319eed687c70cb95836c704fe15afa5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 5 Feb 2017 22:24:47 +0100 Subject: [PATCH] Makefile: install cargodeps without extension Otherwise RPM bytecompile script will try to create bytecompiled code and will fail. Signed-off-by: Igor Gnatenko --- Makefile | 2 +- data/cargo.attr | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 20ab493..8f4554a 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ install-rust2rpm: rust2rpm.pyz install-cargodeps: cargodeps.pyz @echo "Installing cargodeps zipapp" install -d -m 0755 $(DESTDIR)$(RPMDIR) - install -m 0755 -p cargodeps.pyz $(DESTDIR)$(RPMDIR)/cargodeps.py + install -m 0755 -p cargodeps.pyz $(DESTDIR)$(RPMDIR)/cargodeps @echo "Installing RPM macro" install -d -m 0755 $(DESTDIR)$(RPMDIR)/macros.d install -m 0644 -p data/macros.rust-srpm $(DESTDIR)$(RPMDIR)/macros.d/macros.rust-srpm diff --git a/data/cargo.attr b/data/cargo.attr index 06ad2cc..13b5491 100644 --- a/data/cargo.attr +++ b/data/cargo.attr @@ -1,4 +1,4 @@ -%__cargo_provides %{_rpmconfigdir}/cargodeps.py --provides -%__cargo_requires %{_rpmconfigdir}/cargodeps.py --requires -%__cargo_conflicts %{_rpmconfigdir}/cargodeps.py --conflicts +%__cargo_provides %{_rpmconfigdir}/cargodeps --provides +%__cargo_requires %{_rpmconfigdir}/cargodeps --requires +%__cargo_conflicts %{_rpmconfigdir}/cargodeps --conflicts %__cargo_path ^%{cargo_registry}/[^/]+/Cargo\\.toml$