diff --git a/.gitignore b/.gitignore index bbacdcf..95143d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /url-1.6.0.crate /url-1.7.0.crate +/url-1.7.1.crate diff --git a/0001-Update-to-rustc_test-0.3-unbreak-tests-on-nightly-20.patch b/0001-Update-to-rustc_test-0.3-unbreak-tests-on-nightly-20.patch deleted file mode 100644 index 8df7c73..0000000 --- a/0001-Update-to-rustc_test-0.3-unbreak-tests-on-nightly-20.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9d500e76a0e1644c93b3869588f979e4440e74d6 Mon Sep 17 00:00:00 2001 -From: Simon Sapin -Date: Sun, 25 Feb 2018 08:21:55 +0100 -Subject: [PATCH] Update to rustc_test 0.3, unbreak tests on nightly-2018-02-25 - -Version 0.2 of the crates.io package `rustc_test` uses `test` as its -rustc crate name, shadowing the `test` crate from the standard library. -This made up subject to breaking changes to its private APIs: - -https://travis-ci.org/SimonSapin/run-nightly/builds/345808272#L549 ---- - tests/data.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/data.rs b/tests/data.rs -index 8885f64..e9203b1 100644 ---- a/tests/data.rs -+++ b/tests/data.rs -@@ -9,7 +9,7 @@ - //! Data-driven tests - - extern crate rustc_serialize; --extern crate test; -+extern crate rustc_test as test; - extern crate url; - - use rustc_serialize::json::{self, Json}; --- -2.16.2 - diff --git a/rust-url.spec b/rust-url.spec index bbb92e7..2c7abe5 100644 --- a/rust-url.spec +++ b/rust-url.spec @@ -5,18 +5,13 @@ %global crate url Name: rust-%{crate} -Version: 1.7.0 -Release: 2%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: URL library for Rust, based on the WHATWG URL Standard License: MIT or ASL 2.0 URL: https://crates.io/crates/url Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate -# Initial patched metadata -# * Bump rustc-test to 0.3, https://github.com/servo/rust-url/commit/9d500e76a0e1644c93b3869588f979e4440e74d6 -Patch0: url-1.7.0-fix-metadata.diff -# Make it work with new rustc-test -Patch1: 0001-Update-to-rustc_test-0.3-unbreak-tests-on-nightly-20.patch ExclusiveArch: %{rust_arches} @@ -31,6 +26,7 @@ BuildRequires: (crate(rustc-serialize) >= 0.3.0 with crate(rustc-serialize) < 0 BuildRequires: (crate(serde) >= 0.6.1 with crate(serde) < 0.9.0) %if %{with check} # [dev-dependencies] +BuildRequires: (crate(bencher) >= 0.1.0 with crate(bencher) < 0.2.0) BuildRequires: (crate(rustc-serialize) >= 0.3.0 with crate(rustc-serialize) < 0.4.0) BuildRequires: (crate(rustc-test) >= 0.3.0 with crate(rustc-test) < 0.4.0) BuildRequires: (crate(serde_json) >= 0.6.1 with crate(serde_json) < 0.9.0) @@ -72,6 +68,9 @@ which use %{crate} from crates.io. %exclude %{cargo_registry}/%{crate}-%{version}/{appveyor.yml,docs} %changelog +* Fri Jul 06 2018 Igor Gnatenko - 1.7.1-1 +- Update to 1.7.1 + * Tue Mar 13 2018 Igor Gnatenko - 1.7.0-2 - Bump rustc-test to 0.3 diff --git a/sources b/sources index d564d00..d2c5136 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (url-1.7.0.crate) = 080c4b3a7e576fd4cd269605a5bd51c3e04fe9157200f7f411fc10d6f5a86b49c0e5c1dbb0bd522fe4be652836785ab716a80fd73474476040a0a7055772d90f +SHA512 (url-1.7.1.crate) = 912632e35c7ec076f29c02b93010d72f56989e2a8155d6b341c95cb79d65ffdeb32d31fa53ef59bf3d39683e1c51f4be1156c1d0c88f6b86a1bf42cd0ae00c71 diff --git a/url-1.7.0-fix-metadata.diff b/url-1.7.0-fix-metadata.diff deleted file mode 100644 index c554725..0000000 --- a/url-1.7.0-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- url-1.7.0/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ url-1.7.0/Cargo.toml 2018-03-13T12:28:19.050950+01:00 -@@ -61,7 +61,7 @@ - version = "0.3" - - [dev-dependencies.rustc-test] --version = "0.2" -+version = "0.3" - - [dev-dependencies.serde_json] - version = ">=0.6.1, <0.9"