From 349c7189cb33d384e542ddf3ccf4b53c607b5dd1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 26 Oct 2018 17:22:19 +0200 Subject: [PATCH] Adapt to new packaging Signed-off-by: Igor Gnatenko --- rust-pkg-config.spec | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/rust-pkg-config.spec b/rust-pkg-config.spec index 295b680..bd38f1c 100644 --- a/rust-pkg-config.spec +++ b/rust-pkg-config.spec @@ -7,7 +7,7 @@ Name: rust-%{crate} Version: 0.3.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to run the pkg-config system tool # Upstream license specification: MIT/Apache-2.0 @@ -19,24 +19,41 @@ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0) +BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) %endif -%description -%{summary}. +%global _description \ +A library to run the pkg-config system tool at build time in order to be used\ +in Cargo build scripts. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch Requires: %{_bindir}/pkg-config -%description devel -A library to run the pkg-config system tool at build time in order to be used -in Cargo build scripts. +%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 @@ -53,12 +70,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Fri Oct 26 2018 Igor Gnatenko - 0.3.14-3 +- Adapt to new packaging + * Sun Oct 07 2018 Igor Gnatenko - 0.3.14-2 - Run tests in infrastructure