From d1963b7b15985e406eb3b71200e96376e60028235754c52222e6be3e0f684f95 Mon Sep 17 00:00:00 2001
From: Luke Jones <luke@ljones.dev>
Date: Sun, 26 Nov 2017 00:27:34 +0000
Subject: [PATCH] Accepting request 545493 from home:mmanu84:rust

- Update to v1.22.1
- Update Cargo to fix an issue with macOS 10.13 "High Sierra"

OBS-URL: https://build.opensuse.org/request/show/545493
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=138
---
 cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz |  3 ---
 ....22.0-armv7-unknown-linux-gnueabihf.tar.gz |  3 ---
 cargo-0.22.0-i686-unknown-linux-gnu.tar.gz    |  3 ---
 ...-0.22.0-powerpc64-unknown-linux-gnu.tar.gz |  3 ---
 ....22.0-powerpc64le-unknown-linux-gnu.tar.gz |  3 ---
 cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz   |  3 ---
 cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz  |  3 ---
 cargo-0.23.0-aarch64-unknown-linux-gnu.tar.gz |  3 +++
 ...-0.23.0-arm-unknown-linux-gnueabihf.tar.gz |  3 +++
 ....23.0-armv7-unknown-linux-gnueabihf.tar.gz |  3 +++
 cargo-0.23.0-i686-unknown-linux-gnu.tar.gz    |  3 +++
 ...-0.23.0-powerpc64-unknown-linux-gnu.tar.gz |  3 +++
 ....23.0-powerpc64le-unknown-linux-gnu.tar.gz |  3 +++
 cargo-0.23.0-s390x-unknown-linux-gnu.tar.gz   |  3 +++
 cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz  |  3 +++
 rust.changes                                  |  6 +++++
 rust.spec                                     | 24 ++++++++++++-------
 rustc-1.22.0-src.tar.gz                       |  3 ---
 rustc-1.22.1-src.tar.gz                       |  3 +++
 19 files changed, 49 insertions(+), 32 deletions(-)
 delete mode 100644 cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz
 delete mode 100644 cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz
 delete mode 100644 cargo-0.22.0-i686-unknown-linux-gnu.tar.gz
 delete mode 100644 cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz
 delete mode 100644 cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz
 delete mode 100644 cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz
 delete mode 100644 cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz
 create mode 100644 cargo-0.23.0-aarch64-unknown-linux-gnu.tar.gz
 create mode 100644 cargo-0.23.0-arm-unknown-linux-gnueabihf.tar.gz
 create mode 100644 cargo-0.23.0-armv7-unknown-linux-gnueabihf.tar.gz
 create mode 100644 cargo-0.23.0-i686-unknown-linux-gnu.tar.gz
 create mode 100644 cargo-0.23.0-powerpc64-unknown-linux-gnu.tar.gz
 create mode 100644 cargo-0.23.0-powerpc64le-unknown-linux-gnu.tar.gz
 create mode 100644 cargo-0.23.0-s390x-unknown-linux-gnu.tar.gz
 create mode 100644 cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz
 delete mode 100644 rustc-1.22.0-src.tar.gz
 create mode 100644 rustc-1.22.1-src.tar.gz

diff --git a/cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz b/cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz
deleted file mode 100644
index 3001913..0000000
--- a/cargo-0.22.0-aarch64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:440b6f3b9f7be895f2bffe5e314c98af41421c2b9cb1cfd19760e896b18eef87
-size 4217617
diff --git a/cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz b/cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz
deleted file mode 100644
index 348ec62..0000000
--- a/cargo-0.22.0-armv7-unknown-linux-gnueabihf.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54f09a39a74905ab9bb89dae898479713360dfb2ee126cb592dff517ea06b7f3
-size 4972523
diff --git a/cargo-0.22.0-i686-unknown-linux-gnu.tar.gz b/cargo-0.22.0-i686-unknown-linux-gnu.tar.gz
deleted file mode 100644
index ef4ffef..0000000
--- a/cargo-0.22.0-i686-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:158ea19c2c72a168de2a71a2b2fda7435080d238439f4460a7bb4a082f109443
-size 5239010
diff --git a/cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz b/cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz
deleted file mode 100644
index 945bcb8..0000000
--- a/cargo-0.22.0-powerpc64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:360a14b1a5aaee55b06c09194c59da91e3a25a5155fc7c4e9905ac63bdf3d104
-size 4950668
diff --git a/cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz b/cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz
deleted file mode 100644
index bb93ed1..0000000
--- a/cargo-0.22.0-powerpc64le-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9dbe96162c7cb3e8be1e525ac5d5fe4117594df1410e65bdc91ae333c4e2586f
-size 4915347
diff --git a/cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz b/cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz
deleted file mode 100644
index 8e80c24..0000000
--- a/cargo-0.22.0-s390x-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4e65fcd6be9de6f5f8942d31faa60434aa29523ac1214bf52df25e283b199a1
-size 4370992
diff --git a/cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz b/cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz
deleted file mode 100644
index dbd0e20..0000000
--- a/cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eca53c055006f3a77871317368d4bd585ffb04ddbf0ecd2aa79aaf5cc4c84280
-size 5317576
diff --git a/cargo-0.23.0-aarch64-unknown-linux-gnu.tar.gz b/cargo-0.23.0-aarch64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..eb59916
--- /dev/null
+++ b/cargo-0.23.0-aarch64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:502a87264148e359218136c0c98a6f60107d15254d99a015ffbf876929e56031
+size 4257613
diff --git a/cargo-0.23.0-arm-unknown-linux-gnueabihf.tar.gz b/cargo-0.23.0-arm-unknown-linux-gnueabihf.tar.gz
new file mode 100644
index 0000000..a4e1e35
--- /dev/null
+++ b/cargo-0.23.0-arm-unknown-linux-gnueabihf.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14b5e6a4625e3a9fcf7805a4bab1f67b4816b56419f7cfaee94d84b2c82def72
+size 5244349
diff --git a/cargo-0.23.0-armv7-unknown-linux-gnueabihf.tar.gz b/cargo-0.23.0-armv7-unknown-linux-gnueabihf.tar.gz
new file mode 100644
index 0000000..e05cf06
--- /dev/null
+++ b/cargo-0.23.0-armv7-unknown-linux-gnueabihf.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:883879cd5bb441d080bd2aa53b7d7edb19402509909d36c8421bc6ebc20884ea
+size 5026354
diff --git a/cargo-0.23.0-i686-unknown-linux-gnu.tar.gz b/cargo-0.23.0-i686-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..29591e5
--- /dev/null
+++ b/cargo-0.23.0-i686-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ebe231e5da2a06370f17050285ee694cf09ac2010d87dab334ae7eb7fb2d975
+size 5312890
diff --git a/cargo-0.23.0-powerpc64-unknown-linux-gnu.tar.gz b/cargo-0.23.0-powerpc64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..5b11576
--- /dev/null
+++ b/cargo-0.23.0-powerpc64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba4cc5ca31c5016dbb06313065607050afb690945307752307b778abda92e78f
+size 5006995
diff --git a/cargo-0.23.0-powerpc64le-unknown-linux-gnu.tar.gz b/cargo-0.23.0-powerpc64le-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..b57bca5
--- /dev/null
+++ b/cargo-0.23.0-powerpc64le-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3adb3ff6d250962211dda4b2336111a2b690963dad69172ec4d38ab6a82241c2
+size 4982625
diff --git a/cargo-0.23.0-s390x-unknown-linux-gnu.tar.gz b/cargo-0.23.0-s390x-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..f1b5413
--- /dev/null
+++ b/cargo-0.23.0-s390x-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eda613e1efeb97187b7cd0ebdcf98eb44a0c31eafdd4f4898a7740e02ca72893
+size 4405145
diff --git a/cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz b/cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz
new file mode 100644
index 0000000..4a302dc
--- /dev/null
+++ b/cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:450bd9a2f457422e42d898ef8d970919c6b7d1bbedb4e92606a8cfeedc6ed5bd
+size 5365725
diff --git a/rust.changes b/rust.changes
index 9c5b540..c9d7c67 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 25 09:54:46 UTC 2017 - mmanu84@outlook.de
+
+- Update to v1.22.1
+- Update Cargo to fix an issue with macOS 10.13 "High Sierra"
+
 -------------------------------------------------------------------
 Thu Nov 23 00:27:24 UTC 2017 - jones_ld@protonmail.com
 
diff --git a/rust.spec b/rust.spec
index a976a1a..b117e5a 100644
--- a/rust.spec
+++ b/rust.spec
@@ -18,7 +18,7 @@
 
 
 %global prev_rust 1.21.0
-%global cargo_version 0.22.0
+%global cargo_version 0.23.0
 %bcond_with rust_bootstrap
 
 %global rust_arch %{_arch}
@@ -27,6 +27,10 @@
 %global rust_arch armv7
 %global abi gnueabihf
 %endif
+%ifarch armv6hl
+%global rust_arch arm
+%global abi gnueabihf
+%endif
 %ifarch ppc64
 %global rust_arch powerpc64
 %endif
@@ -44,7 +48,7 @@
 %global rustlibdir %{common_libdir}/rustlib
 
 Name:           rust
-Version:        1.22.0
+Version:        1.22.1
 Release:        0
 Summary:        A systems programming language
 License:        MIT or Apache-2.0
@@ -57,9 +61,10 @@ Source100:      cargo-%{cargo_version}-x86_64-unknown-linux-gnu.tar.gz
 Source101:      cargo-%{cargo_version}-i686-unknown-linux-gnu.tar.gz
 Source102:      cargo-%{cargo_version}-aarch64-unknown-linux-gnu.tar.gz
 Source103:      cargo-%{cargo_version}-armv7-unknown-linux-gnueabihf.tar.gz
-Source104:      cargo-%{cargo_version}-powerpc64-unknown-linux-gnu.tar.gz
-Source105:      cargo-%{cargo_version}-powerpc64le-unknown-linux-gnu.tar.gz
-Source106:      cargo-%{cargo_version}-s390x-unknown-linux-gnu.tar.gz
+Source104:      cargo-%{cargo_version}-arm-unknown-linux-gnueabihf.tar.gz
+Source105:      cargo-%{cargo_version}-powerpc64-unknown-linux-gnu.tar.gz
+Source106:      cargo-%{cargo_version}-powerpc64le-unknown-linux-gnu.tar.gz
+Source107:      cargo-%{cargo_version}-s390x-unknown-linux-gnu.tar.gz
 # PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs
 BuildRequires:  ccache
 BuildRequires:  cmake >= 3.4.3
@@ -165,15 +170,18 @@ as RLS or racer.
 %ifarch armv7hl
 %setup -q -T -b 103 -n cargo-%{cargo_version}-%{rust_triple}
 %endif
-%ifarch ppc64
+%ifarch armv6hl
 %setup -q -T -b 104 -n cargo-%{cargo_version}-%{rust_triple}
 %endif
-%ifarch ppc64le
+%ifarch ppc64
 %setup -q -T -b 105 -n cargo-%{cargo_version}-%{rust_triple}
 %endif
-%ifarch s390x
+%ifarch ppc64le
 %setup -q -T -b 106 -n cargo-%{cargo_version}-%{rust_triple}
 %endif
+%ifarch s390x
+%setup -q -T -b 107 -n cargo-%{cargo_version}-%{rust_triple}
+%endif
 
 # The cargo binary is only used to build rust and is not shipped
 %global cargo_bin %{_builddir}/cargo-%{cargo_version}-%{rust_triple}/cargo/bin/cargo
diff --git a/rustc-1.22.0-src.tar.gz b/rustc-1.22.0-src.tar.gz
deleted file mode 100644
index 84f32d1..0000000
--- a/rustc-1.22.0-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ac96fbc4fc4a616f8b0ad2f458f2af7e03c141271624cfb2be907b05cbe4a69
-size 54935084
diff --git a/rustc-1.22.1-src.tar.gz b/rustc-1.22.1-src.tar.gz
new file mode 100644
index 0000000..572abd3
--- /dev/null
+++ b/rustc-1.22.1-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b7a42bdd6eb205a8c533eb41b5c42389a88158d060aed1e0f461f68c1fd3fd3
+size 54935620