diff --git a/rust-rustc-test.spec b/rust-rustc-test.spec
index 4cbae2a..877aaaf 100644
--- a/rust-rustc-test.spec
+++ b/rust-rustc-test.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm
+# Generated by rust2rpm 12
 # * Some mismatch on stable Rust, https://github.com/servo/rustc-test/issues/7
 %bcond_with check
 %global debug_package %{nil}
@@ -7,7 +7,7 @@
 
 Name:           rust-%{crate}
 Version:        0.3.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Fork of Rust’s `test` crate that doesn’t require unstable language features
 
 # Upstream license specification: MIT OR Apache-2.0
@@ -16,21 +16,18 @@ License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/rustc-test
 Source:         %{crates_source}
 # Initial patched metadata
-# * Bump term to 0.5, https://github.com/servo/rustc-test/pull/9
+# * Bump term to 0.6, https://github.com/servo/rustc-test/pull/9
 Patch0:         rustc-test-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch:      noarch
+%endif
 
 BuildRequires:  rust-packaging
-BuildRequires:  (crate(getopts/default) >= 0.2.0 with crate(getopts/default) < 0.3.0)
-BuildRequires:  (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0)
-BuildRequires:  (crate(rustc-serialize/default) >= 0.3.0 with crate(rustc-serialize/default) < 0.4.0)
-BuildRequires:  (crate(rustc_version/default) >= 0.2.1 with crate(rustc_version/default) < 0.3.0)
-BuildRequires:  (crate(term/default) >= 0.5.0 with crate(term/default) < 0.6.0)
-BuildRequires:  (crate(time/default) >= 0.1.0 with crate(time/default) < 0.2.0)
 
-%global _description \
-A fork of Rust’s `test` crate that doesn’t require unstable language features.
+%global _description %{expand:
+Fork of Rust’s `test` crate that doesn’t require unstable language features.}
 
 %description %{_description}
 
@@ -44,7 +41,7 @@ This package contains library source intended for building other packages
 which use "%{crate}" crate.
 
 %files          devel
-%{cargo_registry}/%{crate}-%{version}/
+%{cargo_registry}/%{crate}-%{version_no_tilde}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -56,7 +53,7 @@ This package contains library source intended for building other packages
 which use "default" feature of "%{crate}" crate.
 
 %files       -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
 %package     -n %{name}+asm_black_box-devel
 Summary:        %{summary}
@@ -68,7 +65,7 @@ This package contains library source intended for building other packages
 which use "asm_black_box" feature of "%{crate}" crate.
 
 %files       -n %{name}+asm_black_box-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
 %package     -n %{name}+capture-devel
 Summary:        %{summary}
@@ -80,12 +77,15 @@ This package contains library source intended for building other packages
 which use "capture" feature of "%{crate}" crate.
 
 %files       -n %{name}+capture-devel
-%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
+%generate_buildrequires
+%cargo_generate_buildrequires
+
 %build
 %cargo_build
 
@@ -98,6 +98,9 @@ which use "capture" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Sat Dec 14 03:22:45 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.3.0-7
+- Bump term to 0.6
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/rustc-test-fix-metadata.diff b/rustc-test-fix-metadata.diff
index 7f39537..7a4b0a0 100644
--- a/rustc-test-fix-metadata.diff
+++ b/rustc-test-fix-metadata.diff
@@ -5,7 +5,7 @@
  
  [dependencies.term]
 -version = "0.4"
-+version = "0.5"
++version = "0.6"
  
  [dependencies.time]
  version = "0.1"