From 162a39ff559d9c1b10c783e5df890c70471ea073 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 28 Oct 2018 02:22:10 +0200 Subject: [PATCH] Adapt to new packaging Signed-off-by: Igor Gnatenko --- rust-grep-matcher.spec | 44 ++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/rust-grep-matcher.spec b/rust-grep-matcher.spec index 36822cb..27f13ba 100644 --- a/rust-grep-matcher.spec +++ b/rust-grep-matcher.spec @@ -7,7 +7,7 @@ Name: rust-%{crate} Version: 0.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Trait for regular expressions, with a focus on line oriented search # Upstream license specification: Unlicense/MIT @@ -18,25 +18,41 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(memchr) >= 2.0.2 with crate(memchr) < 3.0.0) +BuildRequires: (crate(memchr/default) >= 2.0.2 with crate(memchr/default) < 3.0.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(regex) >= 1.0.5 with crate(regex) < 2.0.0) +BuildRequires: (crate(regex/default) >= 1.0.5 with crate(regex/default) < 2.0.0) %endif -%description -%{summary}. +%global _description \ +A trait for regular expressions, with a focus on line oriented search. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -A trait for regular expressions, with a focus on line oriented search. +%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 UNLICENSE LICENSE-MIT +%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 +69,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license UNLICENSE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sun Oct 28 2018 Igor Gnatenko - 0.1.1-3 +- Adapt to new packaging + * Sun Oct 07 2018 Igor Gnatenko - 0.1.1-2 - Run tests in infrastructure