From 457e0516540f4ec71788da067286beb82a4e6a20 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 17 Mar 2017 11:54:30 -0700 Subject: [PATCH 1/4] Limit rust-lldb arches Using "BuildArch: noarch" and "ExclusiveArch: %arches noarch" per the guidelines for runtime dependencies here: https://fedoraproject.org/wiki/Packaging:Guidelines#Noarch_with_unported_dependencies --- rust.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 1cab21c..9009765 100644 --- a/rust.spec +++ b/rust.spec @@ -43,7 +43,7 @@ Name: rust Version: 1.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and ISC and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -208,6 +208,9 @@ programs. %package lldb Summary: LLDB pretty printers for Rust BuildArch: noarch + +# LLDB is only available on some architectures +ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 noarch Requires: lldb %description lldb @@ -409,6 +412,9 @@ make check || : %changelog +* Fri Mar 17 2017 Josh Stone - 1.16.0-2 +- Limit rust-lldb arches + * Thu Mar 16 2017 Josh Stone - 1.16.0-1 - Update to 1.16.0. - Use rustbuild instead of the old makefiles. From 3c0f5fef47f98585ea19a405a6020fd5883d824b Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 17 Mar 2017 12:08:09 -0700 Subject: [PATCH 2/4] Drop rust-llvm ExclusiveArch: noarch This seemed to make the whole rust.spec attempt a noarch build! --- rust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index 9009765..a14ba78 100644 --- a/rust.spec +++ b/rust.spec @@ -210,7 +210,7 @@ Summary: LLDB pretty printers for Rust BuildArch: noarch # LLDB is only available on some architectures -ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 noarch +ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 Requires: lldb %description lldb From c34ccf6a5e1b18320679b85da4c70362201c97ea Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 17 Mar 2017 13:29:07 -0700 Subject: [PATCH 3/4] rust-lldb requires python-lldb --- rust.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rust.spec b/rust.spec index a14ba78..1d23353 100644 --- a/rust.spec +++ b/rust.spec @@ -212,6 +212,7 @@ BuildArch: noarch # LLDB is only available on some architectures ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 Requires: lldb +Requires: python-lldb %description lldb This package includes the rust-lldb script, which allows easier debugging of Rust From 9245da2d8afb9f4be37b7d56104e6b1d0a7d4c40 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 20 Mar 2017 12:09:48 -0700 Subject: [PATCH 4/4] Make rust-lldb arch-specific to deal with lldb deps --- rust.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/rust.spec b/rust.spec index 1d23353..85fa005 100644 --- a/rust.spec +++ b/rust.spec @@ -32,18 +32,23 @@ %bcond_with bundled_llvm %endif +# LLDB only works on some architectures +%ifarch %{arm} aarch64 %{ix86} x86_64 # LLDB isn't available everywhere... -%if 0%{?rhel} -%bcond_with lldb -%else +%if !0%{?rhel} %bcond_without lldb +%else +%bcond_with lldb +%endif +%else +%bcond_with lldb %endif Name: rust Version: 1.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and ISC and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -207,10 +212,10 @@ programs. %package lldb Summary: LLDB pretty printers for Rust -BuildArch: noarch -# LLDB is only available on some architectures -ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 +# It could be noarch, but lldb has limited availability +#BuildArch: noarch + Requires: lldb Requires: python-lldb @@ -413,6 +418,9 @@ make check || : %changelog +* Mon Mar 20 2017 Josh Stone - 1.16.0-3 +- Make rust-lldb arch-specific to deal with lldb deps + * Fri Mar 17 2017 Josh Stone - 1.16.0-2 - Limit rust-lldb arches