From 7ead92062896e2e839d5e7609bd7db3b03bcfc33a2fc0d3484772e4335d7e355 Mon Sep 17 00:00:00 2001
From: Luke Jones <luke@ljones.dev>
Date: Wed, 14 Nov 2018 04:10:24 +0000
Subject: [PATCH] Accepting request 648802 from
 home:luke_nukem:branches:devel:languages:rust

- Add additional Requires to rls:
  + Requires rust-src
  + Requires rust-analysis
- Add additional Requires to rustfmt:
  + Requires cargo
- Fix rust-src requiring /usr/bin/bash; a script was incorrectly
  edited at build time.

OBS-URL: https://build.opensuse.org/request/show/648802
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=172
---
 rust.changes | 11 +++++++++++
 rust.spec    |  9 ++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/rust.changes b/rust.changes
index 55de73f..921ab51 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Nov 13 22:56:17 UTC 2018 - Luke Jones <jones_ld@protonmail.com>
+
+- Add additional Requires to rls:
+  + Requires rust-src
+  + Requires rust-analysis
+- Add additional Requires to rustfmt:
+  + Requires cargo
+- Fix rust-src requiring /usr/bin/bash; a script was incorrectly
+  edited at build time.
+
 -------------------------------------------------------------------
 Sun Nov 11 19:43:09 UTC 2018 - Luke Jones <jones_ld@protonmail.com>
 
diff --git a/rust.spec b/rust.spec
index 0bfae89..5b705c3 100644
--- a/rust.spec
+++ b/rust.spec
@@ -196,6 +196,8 @@ Summary:        Language server for Rust lang
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
 Requires:       %{name} = %{version}
+Requires:       %{name}-analysis = %{version}
+Requires:       %{name}-src = %{version}
 Provides:       rls = %{rls_version}
 
 %description -n rls
@@ -221,6 +223,7 @@ Summary:        Code formatting tool for Rust lang
 License:        MIT OR Apache-2.0
 Group:          Development/Languages/Rust
 Requires:       %{name} = %{version}
+Requires:       cargo = %{version}
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
 # Legacy SUSE-only form
 Supplements:    packageand(%{name}:cargo)
@@ -240,7 +243,7 @@ Summary:        Lints to catch common mistakes and improve Rust code
 License:        MPL-2.0
 Group:          Development/Languages/Rust
 Requires:       %{name} = %{version}
-Requires:       cargo
+Requires:       cargo = %{version}
 Provides:       clippy = %{clippy_version}
 
 %description -n clippy
@@ -339,14 +342,14 @@ find src/vendor -name .cargo-checksum.json \
 # Fix rpmlint error "This script uses 'env' as an interpreter"
 sed -i '1s|#!%{_bindir}/env python|#!%{_bindir}/python3|' src/jemalloc/scripts/gen_travis.py
 sed -i '1s|#!%{_bindir}/env python|#!%{_bindir}/python3|' src/libcore/unicode/unicode.py
-sed -i '1s|#!%{_bindir}/env bash|#!%{_bindir}/bash|' src/liblibc/ci/emscripten-entry.sh
 find src/libcompiler_builtins/compiler-rt/lib/ -name '*.py' \
   -exec sed -i -e '1s|#!%{_bindir}/env python|#!%{_bindir}/python3|' '{}' '+'
 
-# Fix rpmlint warnings about these shell scripts not having a shebang
+# Fix rpmlint warnings about these shell scripts not having a shebang or incorrect path
 sed -i '1s|^|#!/bin/bash\n|' src/libbacktrace/ltmain.sh
 sed -i '1s|^|#!/bin/bash\n|' src/libcompiler_builtins/ci/run.sh
 sed -i '1s|^|#!/bin/bash\n|' src/liblibc/ci/run-docker.sh
+sed -i '1s|^|#!/bin/bash\n|' src/liblibc/ci/emscripten-entry.sh
 sed -i '1s|^|#!/bin/bash\n|' src/stdsimd/ci/run-docker.sh
 
 %build