The package rpms/rust-packaging.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-packaging.git/commit/?id=401....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit cf920cb932393bbc29af9ce806538145436683e2
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Fri Dec 7 23:19:38 2018 +0100
Set CARGO_HOME
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/0001-Set-CARGO_HOME-to-the-local-.config.patch
b/0001-Set-CARGO_HOME-to-the-local-.config.patch
new file mode 100644
index 0000000..929446a
--- /dev/null
+++ b/0001-Set-CARGO_HOME-to-the-local-.config.patch
@@ -0,0 +1,27 @@
+From b2021363c20787e8d065b17a041d9ae6c5f651d0 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone(a)redhat.com>
+Date: Fri, 7 Dec 2018 13:58:41 -0800
+Subject: [PATCH 1/2] Set CARGO_HOME to the local .config
+
+(cherry picked from commit b4e25038296cd57eba639a059e8baaf139a5d287)
+---
+ data/macros.cargo | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/data/macros.cargo b/data/macros.cargo
+index a0c456a..2dcf971 100644
+--- a/data/macros.cargo
++++ b/data/macros.cargo
+@@ -1,4 +1,8 @@
+-%__cargo %{_bindir}/cargo
++# Since cargo 1.31, install only uses $CARGO_HOME/config, ignoring $PWD.
++#
https://github.com/rust-lang/cargo/issues/6397
++# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
++# it never writes to ~/.cargo during rpmbuild.
++%__cargo %{_bindir}/env CARGO_HOME=.cargo %{_bindir}/cargo
+ %__cargo_common_opts %{?_smp_mflags}
+ %__cargo_inspector %{_bindir}/cargo-inspector
+
+--
+2.20.0.rc2
+
diff --git a/0002-Set-the-install-root-in-.cargo-config.patch
b/0002-Set-the-install-root-in-.cargo-config.patch
new file mode 100644
index 0000000..075c0a2
--- /dev/null
+++ b/0002-Set-the-install-root-in-.cargo-config.patch
@@ -0,0 +1,35 @@
+From 729f22b1c4f43a902af443c009e17d3fbd6fa60a Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone(a)redhat.com>
+Date: Fri, 7 Dec 2018 13:59:03 -0800
+Subject: [PATCH 2/2] Set the install root in .cargo/config
+
+(cherry picked from commit a04e95bc4f807139bd3c4b75f46fd9a60ec1db8f)
+---
+ data/macros.cargo | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/data/macros.cargo b/data/macros.cargo
+index 2dcf971..50bb292 100644
+--- a/data/macros.cargo
++++ b/data/macros.cargo
+@@ -20,6 +20,9 @@ rustc = "%{__rustc}"\
+ rustdoc = "%{__rustdoc}"\
+ rustflags = %{__global_rustflags_toml}\
+ \
++[install]\
++root = "%{buildroot}%{_prefix}"\
++\
+ [term]\
+ verbose = true\
+ \
+@@ -81,7 +84,6 @@ if %__cargo_is_bin; then \
+ %{shrink:%{__cargo} install \
+ %{__cargo_common_opts} \
+ --path . \
+- --root %{buildroot}%{_prefix} \
+ %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
+ %* \
+ }\
+--
+2.20.0.rc2
+
diff --git a/rust-packaging.spec b/rust-packaging.spec
index bc4f873..1ef35b9 100644
--- a/rust-packaging.spec
+++ b/rust-packaging.spec
@@ -5,12 +5,14 @@
Name: rust-packaging
Version: 6
-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-Set-CARGO_HOME-to-the-local-.config.patch
+Patch0002: 0002-Set-the-install-root-in-.cargo-config.patch
ExclusiveArch: %{rust_arches}
@@ -71,6 +73,9 @@ py.test-%{python3_version} -vv test.py
%{python3_sitelib}/rust2rpm/
%changelog
+* Fri Dec 07 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 6-2
+- Set CARGO_HOME
+
* Sun Sep 02 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 6-1
- Update to 6
commit 401f4483af58e8063854edf14ce3a0d7d5f6876a
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sat Nov 3 10:15:56 2018 +0100
Make package archful
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
(cherry picked from commit 965e2b87b5dc2618aacb99bd2875fc673f6746eb)
diff --git a/rust-packaging.spec b/rust-packaging.spec
index 98159e2..bc4f873 100644
--- a/rust-packaging.spec
+++ b/rust-packaging.spec
@@ -1,5 +1,7 @@
%bcond_without check
%{?python_enable_dependency_generator}
+#
https://pagure.io/koji/issue/659
+%global debug_package %{nil}
Name: rust-packaging
Version: 6
@@ -10,8 +12,7 @@ License: MIT
URL:
https://pagure.io/fedora-rust/rust2rpm
Source0:
https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz
-BuildArch: noarch
-ExclusiveArch: %{rust_arches} noarch
+ExclusiveArch: %{rust_arches}
# gawk is needed for stripping dev-deps in macro, 4.1.0 is needed for inplace feature
Requires: gawk >= 4.1.0