From 073e413d6233fa7361531402b5eed35a1a8a01f2 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Apr 28 2017 01:05:07 +0000 Subject: Update to 0.18.0. --- diff --git a/.gitignore b/.gitignore index 56d1883..0ea75fe 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,12 @@ /cargo-0.16.0-vendor.tar.xz /cargo-0.17.0.tar.gz /cargo-0.17.0-vendor.tar.xz +/cargo-0.18.0.tar.gz +/cargo-0.18.0-vendor.tar.xz +/cargo-0.17.0-aarch64-unknown-linux-gnu.tar.gz +/cargo-0.17.0-armv7-unknown-linux-gnueabihf.tar.gz +/cargo-0.17.0-i686-unknown-linux-gnu.tar.gz +/cargo-0.17.0-powerpc64le-unknown-linux-gnu.tar.gz +/cargo-0.17.0-powerpc64-unknown-linux-gnu.tar.gz +/cargo-0.17.0-s390x-unknown-linux-gnu.tar.gz +/cargo-0.17.0-x86_64-unknown-linux-gnu.tar.gz diff --git a/0001-Metadata-response-now-also-contains-package-descript.patch b/0001-Metadata-response-now-also-contains-package-descript.patch deleted file mode 100644 index c94512d..0000000 --- a/0001-Metadata-response-now-also-contains-package-descript.patch +++ /dev/null @@ -1,117 +0,0 @@ -From ab493a17d0eb5d148f4bc504408c7071c12a438b Mon Sep 17 00:00:00 2001 -From: Robert Vally -Date: Thu, 2 Feb 2017 15:59:34 +0800 -Subject: [PATCH 1/2] Metadata response now also contains package description. - ---- - src/cargo/core/package.rs | 3 +++ - tests/metadata.rs | 9 +++++++++ - 2 files changed, 12 insertions(+) - -diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs -index 58135fda..6b4cd283 100644 ---- a/src/cargo/core/package.rs -+++ b/src/cargo/core/package.rs -@@ -31,6 +31,7 @@ struct SerializedPackage<'a> { - id: &'a PackageId, - license: Option<&'a str>, - license_file: Option<&'a str>, -+ description: Option<&'a str>, - source: &'a SourceId, - dependencies: &'a [Dependency], - targets: &'a [Target], -@@ -45,6 +46,7 @@ impl Encodable for Package { - let manmeta = self.manifest.metadata(); - let license = manmeta.license.as_ref().map(String::as_ref); - let license_file = manmeta.license_file.as_ref().map(String::as_ref); -+ let description = manmeta.description.as_ref().map(String::as_ref); - - SerializedPackage { - name: &package_id.name(), -@@ -52,6 +54,7 @@ impl Encodable for Package { - id: package_id, - license: license, - license_file: license_file, -+ description: description, - source: summary.source_id(), - dependencies: summary.dependencies(), - targets: &self.manifest.targets(), -diff --git a/tests/metadata.rs b/tests/metadata.rs -index e65beb7e..349de9fc 100644 ---- a/tests/metadata.rs -+++ b/tests/metadata.rs -@@ -22,6 +22,7 @@ fn cargo_metadata_simple() { - "dependencies": [], - "license": null, - "license_file": null, -+ "description": null, - "targets": [ - { - "kind": [ -@@ -86,6 +87,7 @@ fn cargo_metadata_with_deps_and_version() { - "source": "registry+[..]", - "license": null, - "license_file": null, -+ "description": null, - "targets": [ - { - "kind": [ -@@ -117,6 +119,7 @@ fn cargo_metadata_with_deps_and_version() { - "source": "registry+[..]", - "license": null, - "license_file": null, -+ "description": null, - "targets": [ - { - "kind": [ -@@ -148,6 +151,7 @@ fn cargo_metadata_with_deps_and_version() { - "source": null, - "license": "MIT", - "license_file": null, -+ "description": "foo", - "targets": [ - { - "kind": [ -@@ -210,6 +214,7 @@ fn workspace_metadata() { - "dependencies": [], - "license": null, - "license_file": null, -+ "description": null, - "targets": [ - { - "kind": [ "lib" ], -@@ -228,6 +233,7 @@ fn workspace_metadata() { - "dependencies": [], - "license": null, - "license_file": null, -+ "description": null, - "targets": [ - { - "kind": [ "lib" ], -@@ -281,6 +287,7 @@ fn workspace_metadata_no_deps() { - "dependencies": [], - "license": null, - "license_file": null, -+ "description": null, - "targets": [ - { - "kind": [ "lib" ], -@@ -299,6 +306,7 @@ fn workspace_metadata_no_deps() { - "dependencies": [], - "license": null, - "license_file": null, -+ "description": null, - "targets": [ - { - "kind": [ "lib" ], -@@ -340,6 +348,7 @@ const MANIFEST_OUTPUT: &'static str= - "dependencies":[], - "license": null, - "license_file": null, -+ "description": null, - "targets":[{ - "kind":["bin"], - "name":"foo", --- -2.11.1 - diff --git a/0002-Fixed-failing-read-metadata-test-due-to-addition-of-.patch b/0002-Fixed-failing-read-metadata-test-due-to-addition-of-.patch deleted file mode 100644 index 22c2811..0000000 --- a/0002-Fixed-failing-read-metadata-test-due-to-addition-of-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 776294953c64515ff16456db4cb98ce81e722278 Mon Sep 17 00:00:00 2001 -From: Robert Vally -Date: Thu, 2 Feb 2017 16:22:49 +0800 -Subject: [PATCH 2/2] Fixed failing read-metadata test due to addition of - description. - ---- - tests/read-manifest.rs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/read-manifest.rs b/tests/read-manifest.rs -index 7aceb454..ab29399a 100644 ---- a/tests/read-manifest.rs -+++ b/tests/read-manifest.rs -@@ -11,6 +11,7 @@ static MANIFEST_OUTPUT: &'static str = r#" - "id":"foo[..]0.5.0[..](path+file://[..]/foo)", - "license": null, - "license_file": null, -+ "description": null, - "source":null, - "dependencies":[], - "targets":[{ --- -2.11.1 - diff --git a/cargo.spec b/cargo.spec index 8f99aa3..963fb0c 100644 --- a/cargo.spec +++ b/cargo.spec @@ -12,7 +12,7 @@ %endif Name: cargo -Version: 0.17.0 +Version: 0.18.0 Release: 1%{?dist} Summary: Rust's package manager and build tool License: ASL 2.0 or MIT @@ -20,15 +20,10 @@ URL: https://crates.io/ ExclusiveArch: %{rust_arches} %global cargo_version %{version} -%global cargo_bootstrap 0.16.0 +%global cargo_bootstrap 0.17.0 Source0: https://github.com/rust-lang/%{name}/archive/%{cargo_version}/%{name}-%{cargo_version}.tar.gz -# Expose description in cargo metadata -# https://github.com/rust-lang/cargo/pull/3633 -Patch0001: 0001-Metadata-response-now-also-contains-package-descript.patch -Patch0002: 0002-Fixed-failing-read-metadata-test-due-to-addition-of-.patch - # submodule, bundled for local installation only, not distributed %global rust_installer 4f994850808a572e2cc8d43f968893c8e942e9bf Source1: https://github.com/rust-lang/rust-installer/archive/%{rust_installer}/rust-installer-%{rust_installer}.tar.gz @@ -123,8 +118,6 @@ test -f '%{local_cargo}' # cargo sources %setup -q -n %{name}-%{cargo_version} -%patch0001 -p1 -%patch0002 -p1 # rust-installer %setup -q -n %{name}-%{cargo_version} -T -D -a 1 @@ -195,6 +188,9 @@ rm -rf %{buildroot}/%{_docdir}/%{name}/ %changelog +* Thu Apr 27 2017 Josh Stone - 0.18.0-1 +- Update to 0.18.0. + * Thu Mar 16 2017 Josh Stone - 0.17.0-1 - Update to 0.17.0. diff --git a/sources b/sources index 87e915e..b643b96 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cargo-0.17.0.tar.gz) = 5ea9a382ab48ee714b5cd1412f11ae72c6065913e2ce56cf84fe43f9061fd383f32c16a6525e5400f3fec9c10eaa3e7a149b026ae9c64af0955e91678b032650 -SHA512 (cargo-0.17.0-vendor.tar.xz) = 8ee57e90710db6aa917ac27eb7b0d337cab0db629ffba24a5185c8cb09d684bce4afe3670d16f2bb0e0af44a92d13c30dd3859f52faf4c18a768ed4140e10d15 +SHA512 (cargo-0.18.0.tar.gz) = 561d6817555da802e99964daa74550cc47a285903301da12a245bb62e5857c18069d87a520c5cefb62aecfe5561666352d57dca8f75758f81ea82709565577d2 +SHA512 (cargo-0.18.0-vendor.tar.xz) = e7e69b8e5583c5240862d1b17e321a310cc6eddf093072dc8e2b498a89c442d3ebab336c8a866ef24ec318981616c9292e1af4ed2b3396dccb43812759d8088f SHA512 (rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz) = 9ceb4755890ad3ae68ce141231c5114077261e0279d3a9a6208053f8d3386c9198e6b94d6321b456648dd5baa86dfc3ae81df44b67d41b428d11afd6763f0cff diff --git a/sources-bootstrap b/sources-bootstrap index 7b73bd5..b1262b7 100644 --- a/sources-bootstrap +++ b/sources-bootstrap @@ -1,10 +1,10 @@ -SHA512 (cargo-0.17.0.tar.gz) = 5ea9a382ab48ee714b5cd1412f11ae72c6065913e2ce56cf84fe43f9061fd383f32c16a6525e5400f3fec9c10eaa3e7a149b026ae9c64af0955e91678b032650 -SHA512 (cargo-0.17.0-vendor.tar.xz) = 8ee57e90710db6aa917ac27eb7b0d337cab0db629ffba24a5185c8cb09d684bce4afe3670d16f2bb0e0af44a92d13c30dd3859f52faf4c18a768ed4140e10d15 +SHA512 (cargo-0.18.0.tar.gz) = 561d6817555da802e99964daa74550cc47a285903301da12a245bb62e5857c18069d87a520c5cefb62aecfe5561666352d57dca8f75758f81ea82709565577d2 +SHA512 (cargo-0.18.0-vendor.tar.xz) = e7e69b8e5583c5240862d1b17e321a310cc6eddf093072dc8e2b498a89c442d3ebab336c8a866ef24ec318981616c9292e1af4ed2b3396dccb43812759d8088f SHA512 (rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz) = 9ceb4755890ad3ae68ce141231c5114077261e0279d3a9a6208053f8d3386c9198e6b94d6321b456648dd5baa86dfc3ae81df44b67d41b428d11afd6763f0cff -SHA512 (cargo-0.16.0-aarch64-unknown-linux-gnu.tar.gz) = a6cf2fb429adf682a87cf8591ebe4baa04ed33495c1b81a6bc667a608551e8c95e08ea577023f35bd9f6b2118f5b2d6a8e55dce0e278564da807dd6aadc6f604 -SHA512 (cargo-0.16.0-armv7-unknown-linux-gnueabihf.tar.gz) = 68c0d8191a85a627037874c3fda72b88a12db0e0606bcf00676d705cf04ed977ec909bcacf5269f5a6ef6bf4d8115d07c88859b5b67053f02678333a4c6162b1 -SHA512 (cargo-0.16.0-i686-unknown-linux-gnu.tar.gz) = b32560b64f2596ddc3536b113d3af21348093cf3fcb921faa6df77232451dfea35ba0827e3564d65047b0bcc0df2391bf4ab7c3cdf774aca1fe02db495f0eb14 -SHA512 (cargo-0.16.0-powerpc64le-unknown-linux-gnu.tar.gz) = e3235ef0141c2f611c9405f39c8f5a34906ebb3fe73f51a25fc27a09d60999a42c64bcf0f341e1765d974ee81eabb554978550c4b7f3c715e676ea1190081e63 -SHA512 (cargo-0.16.0-powerpc64-unknown-linux-gnu.tar.gz) = f6e82d04bd91fa032bc430e906c6825b557555906e2f298b2ecf6ccb52b0628694fe9e46b1297458643f2a35aafc5237eabfea487eaf0f6c1dec3c9d5e791740 -SHA512 (cargo-0.16.0-s390x-unknown-linux-gnu.tar.gz) = 19f8b505a848b7be63d8ef47eb04c8ac08b882f8aa5d429d9473065008c9c1eb433995a1508556e931ddd5228bc85b9ac1a10eb9ae1b07771e2766dbffc35ea9 -SHA512 (cargo-0.16.0-x86_64-unknown-linux-gnu.tar.gz) = 83b8066c5f1d27a60fafd8e024772a9bce13962807af9200e4f9d2777792285f9b625cfce8f78ab82760ebb92f493f1814419f1420aba58ce8d50878f727c915 +SHA512 (cargo-0.17.0-aarch64-unknown-linux-gnu.tar.gz) = 03616a7f1557ef8c390a64eb8d00ab070a2481e19b2bae3c68e06d33de5f513555aa5632beaabc9027093b6f33c4b1bd0f246b0254cec53cba724efc1e4fc608 +SHA512 (cargo-0.17.0-armv7-unknown-linux-gnueabihf.tar.gz) = 8b1128d81ae09aa9499b1324d81763cc82d9a8ba7c156b67a63ff7b106bdce964528f031fd45cfd23ed892ca0c6811c20484626dfceb00856364c78c2e55031a +SHA512 (cargo-0.17.0-i686-unknown-linux-gnu.tar.gz) = 7816d5fe0a86c799a375a73fbe19145fd2409749ce3004e397f768e6683d16775f0f1078a21f7be696053479695071f1becdf571996b1eb8c5747ea59900b85e +SHA512 (cargo-0.17.0-powerpc64le-unknown-linux-gnu.tar.gz) = dbaa9b95284f852b67363174d4223f3446f4fd2ef53b644f844c505e4c7ba0660b8bbd731768ea704d7ea821571eaf6c11f491e6bf99ecb21dcf68b0c561b7e3 +SHA512 (cargo-0.17.0-powerpc64-unknown-linux-gnu.tar.gz) = 2d2fd4a34d893f314902d2a7951c08e727ec21428487183be9242037ec3e2f2d0ddd52e9365dbfeab5f9ff2e35b27c41d2ff3896789b3ff24f6ed2184be8b4c8 +SHA512 (cargo-0.17.0-s390x-unknown-linux-gnu.tar.gz) = 82ed0c7a1aecd8d9eafb14a3fb437eab402c52e4d8063f7086822f833648c6bdf82309178b2e31984c8f85504bfed8e13acf9b305d9cd24a2e9bfe72b267c037 +SHA512 (cargo-0.17.0-x86_64-unknown-linux-gnu.tar.gz) = 4f0d40e1be1b73ba84a9ae1f36fc588fd3b3a24bfb1982a3e3311f44f044b4a3994b78de57575dd9bed21f79d4e5e3da91117f282e6dcefd07bb3abf030e0544