From d91cc484ef867e6070196938b14371f978fd0531 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Tue, 18 Feb 2020 16:33:21 +0100 Subject: [PATCH] Fix FTBFS Signed-off-by: Igor Raits --- chrono-fix-metadata.diff | 12 ++++++++++-- rust-chrono.spec | 26 +++++++++++++++----------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/chrono-fix-metadata.diff b/chrono-fix-metadata.diff index d927c62..4797e0a 100644 --- a/chrono-fix-metadata.diff +++ b/chrono-fix-metadata.diff @@ -1,6 +1,14 @@ --- chrono-0.4.10/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ chrono-0.4.10/Cargo.toml 2019-12-02T10:03:49.783594+00:00 -@@ -75,16 +75,6 @@ ++++ chrono-0.4.10/Cargo.toml 2020-02-18T15:29:36.458224+00:00 +@@ -68,6 +68,7 @@ + [dev-dependencies.serde_json] + version = "1" + default-features = false ++features = ["alloc"] + + [features] + alloc = [] +@@ -75,16 +76,6 @@ clock = ["time", "std"] default = ["clock", "std"] std = [] diff --git a/rust-chrono.spec b/rust-chrono.spec index 287fdfd..c2e26a9 100644 --- a/rust-chrono.spec +++ b/rust-chrono.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 13 %bcond_without check %global debug_package %{nil} @@ -6,7 +6,7 @@ Name: rust-%{crate} Version: 0.4.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Date and time library for Rust # Upstream license specification: MIT/Apache-2.0 @@ -15,6 +15,7 @@ URL: https://crates.io/crates/chrono Source: %{crates_source} # Initial patched metadata # * No wasm +# * Add missing feature to serde_json, https://github.com/chronotope/chrono/pull/396 Patch0: chrono-fix-metadata.diff ExclusiveArch: %{rust_arches} @@ -41,7 +42,7 @@ which use "%{crate}" crate. %files devel %license LICENSE.txt %doc README.md CHANGELOG.md AUTHORS.txt -%{cargo_registry}/%{crate}-%{version}/ +%{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel Summary: %{summary} @@ -53,7 +54,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}+alloc-devel Summary: %{summary} @@ -65,7 +66,7 @@ This package contains library source intended for building other packages which use "alloc" feature of "%{crate}" crate. %files -n %{name}+alloc-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+bench-devel Summary: %{summary} @@ -77,7 +78,7 @@ This package contains library source intended for building other packages which use "bench" feature of "%{crate}" crate. %files -n %{name}+bench-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+clock-devel Summary: %{summary} @@ -89,7 +90,7 @@ This package contains library source intended for building other packages which use "clock" feature of "%{crate}" crate. %files -n %{name}+clock-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+rustc-serialize-devel Summary: %{summary} @@ -101,7 +102,7 @@ This package contains library source intended for building other packages which use "rustc-serialize" feature of "%{crate}" crate. %files -n %{name}+rustc-serialize-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+serde-devel Summary: %{summary} @@ -113,7 +114,7 @@ This package contains library source intended for building other packages which use "serde" feature of "%{crate}" crate. %files -n %{name}+serde-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -125,7 +126,7 @@ This package contains library source intended for building other packages which use "std" feature of "%{crate}" crate. %files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+time-devel Summary: %{summary} @@ -137,7 +138,7 @@ This package contains library source intended for building other packages which use "time" feature of "%{crate}" crate. %files -n %{name}+time-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 @@ -158,6 +159,9 @@ which use "time" feature of "%{crate}" crate. %endif %changelog +* Tue Feb 18 16:29:36 CET 2020 Igor Raits - 0.4.10-3 +- Fix FTBFS + * Thu Jan 30 2020 Fedora Release Engineering - 0.4.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild