Skip to content

Commit 1464ce1

Browse files
committed
[build] Do not require specific version of rust-std-static-i686-unknown-linux-gnu package. JB#50499
Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
1 parent c308746 commit 1464ce1

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

rust.changes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* Mon Jan 25 2021 Matti Kosola <matti.kosola@jolla.com> - 1.44.0+git8
2+
- Do not require specific version of rust-std-static-i686-unknown-linux-gnu package. JB#50499
3+
14
* Fri Jan 22 2021 David Greaves <david.greaves@jolla.com> - 1.44.0+git7
25
- [build] Disable aarch64. JB#50499
36
- Remove unused bootstrap binaries

rust.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
%bcond_without lldb
4545

4646
Name: rust
47-
Version: %{rust_version}+git7
47+
Version: %{rust_version}+git8
4848
Release: 1
4949
Summary: The Rust Programming Language
5050
License: (ASL 2.0 or MIT) and (BSD and MIT)
@@ -512,7 +512,9 @@ rm -fr %{buildroot}%{_mandir}/man1
512512
# The requires should specify = %%{version}-%%{release} but they are repackaged from
513513
# cross-rust and we can't specify the release in OBS
514514
Requires: %{name}-std-static = %{version}
515-
Requires: %{name}-std-static-%{rust_x86_triple} = %{version}
515+
# There should be an = %version dependency for external deployment but the cross-
516+
# packaging doesn't work properly
517+
Requires: %{name}-std-static-%{rust_x86_triple}
516518

517519
%description
518520
A stub of rust for use in scratchbox2

0 commit comments

Comments
 (0)