From c53e20309d905de0a6da0872f690925a8db5ed42 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 2 Nov 2018 18:51:47 +0100 Subject: [PATCH] Adapt to new packaging Signed-off-by: Igor Gnatenko --- ...x-metadata.diff => errno-fix-metadata.diff | 4 +- rust-errno.spec | 45 ++++++++++++------- 2 files changed, 32 insertions(+), 17 deletions(-) rename errno-0.2.4-fix-metadata.diff => errno-fix-metadata.diff (79%) diff --git a/errno-0.2.4-fix-metadata.diff b/errno-fix-metadata.diff similarity index 79% rename from errno-0.2.4-fix-metadata.diff rename to errno-fix-metadata.diff index 6dcb58e..4aade83 100644 --- a/errno-0.2.4-fix-metadata.diff +++ b/errno-fix-metadata.diff @@ -1,5 +1,5 @@ ---- errno-0.2.4/Cargo.toml 1969-12-31T16:00:00-08:00 -+++ errno-0.2.4/Cargo.toml 2018-07-10T21:36:13.719848-07:00 +--- errno-0.2.4/Cargo.toml 1970-01-01T01:00:00+01:00 ++++ errno-0.2.4/Cargo.toml 2018-11-02T18:45:02.098347+01:00 @@ -19,13 +19,8 @@ categories = ["os"] license = "MIT/Apache-2.0" diff --git a/rust-errno.spec b/rust-errno.spec index 64297e7..caa21b7 100644 --- a/rust-errno.spec +++ b/rust-errno.spec @@ -6,34 +6,52 @@ Name: rust-%{crate} Version: 0.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cross-platform interface to the `errno` variable +# Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/errno Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate # Initial patched metadata # * No windows or dragonfly -Patch0: errno-0.2.4-fix-metadata.diff +Patch0: errno-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0) +BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) -%description -%{summary}. +%global _description \ +Cross-platform interface to the `errno` variable. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -Cross-platform interface to the `errno` variable. +%description devel %{_description} This package contains library source intended for building other packages -which use %{crate} from crates.io. +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 "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -p1 @@ -50,13 +68,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 +* Fri Nov 02 2018 Igor Gnatenko - 0.2.4-3 +- Adapt to new packaging + * Sat Jul 14 2018 Fedora Release Engineering - 0.2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild