diff --git a/rust-time.spec b/rust-time.spec index 50111fb..9df8b69 100644 --- a/rust-time.spec +++ b/rust-time.spec @@ -6,39 +6,69 @@ Name: rust-%{crate} Version: 0.1.40 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utilities for working with time-related functions in Rust +# Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/time Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate # Initial patched metadata # * No windows/redox -Patch0: time-0.1.40-fix-metadata.diff +# * Exclude CI files, https://github.com/rust-lang-deprecated/time/pull/170 +Patch0: time-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(libc) >= 0.2.1 with crate(libc) < 0.3.0) -BuildRequires: (crate(rustc-serialize) >= 0.3.0 with crate(rustc-serialize) < 0.4.0) +BuildRequires: (crate(libc/default) >= 0.2.1 with crate(libc/default) < 0.3.0) +BuildRequires: (crate(rustc-serialize/default) >= 0.3.0 with crate(rustc-serialize/default) < 0.4.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(log) >= 0.4.0 with crate(log) < 0.5.0) +BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0) %endif -%description -%{summary}. +%global _description \ +Utilities for working with time-related functions in Rust. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -Utilities for working with time-related functions in Rust. +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE-MIT LICENSE-APACHE +%doc README.md +%{cargo_registry}/%{crate}-%{version}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} This package contains library source intended for building other packages -which use %{crate} from crates.io. +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+rustc-serialize-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rustc-serialize-devel %{_description} + +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 %prep %autosetup -n %{crate}-%{version} -p1 @@ -55,13 +85,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml - %changelog +* Wed Oct 31 2018 Igor Gnatenko - 0.1.40-3 +- Adapt to new packaging + * Sat Jul 14 2018 Fedora Release Engineering - 0.1.40-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/time-0.1.40-fix-metadata.diff b/time-fix-metadata.diff similarity index 61% rename from time-0.1.40-fix-metadata.diff rename to time-fix-metadata.diff index 8c978cc..20b8a23 100644 --- a/time-0.1.40-fix-metadata.diff +++ b/time-fix-metadata.diff @@ -1,6 +1,14 @@ --- time-0.1.40/Cargo.toml 1970-01-01T01:00:00+01:00 -+++ time-0.1.40/Cargo.toml 2018-05-12T15:37:08.034131+02:00 -@@ -28,14 +28,6 @@ ++++ time-0.1.40/Cargo.toml 2018-10-31T12:07:30.284075+01:00 +@@ -19,6 +19,7 @@ + documentation = "https://doc.rust-lang.org/time" + license = "MIT/Apache-2.0" + repository = "https://github.com/rust-lang/time" ++exclude = ["/.travis.yml", "/appveyor.yml"] + [dependencies.libc] + version = "0.2.1" + +@@ -28,14 +29,6 @@ [dev-dependencies.log] version = "0.4"