From 39c750b81b1bd8bbc97f9804008ea09382d5f68c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 27 Oct 2018 22:50:38 +0200 Subject: [PATCH] Adapt to new packaging Signed-off-by: Igor Gnatenko --- rust-regex-syntax.spec | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/rust-regex-syntax.spec b/rust-regex-syntax.spec index 61015f9..708b46b 100644 --- a/rust-regex-syntax.spec +++ b/rust-regex-syntax.spec @@ -7,9 +7,10 @@ Name: rust-%{crate} Version: 0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Regular expression parser +# Upstream license specification: MIT/Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/regex-syntax Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate @@ -17,21 +18,37 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(ucd-util) >= 0.1.0 with crate(ucd-util) < 0.2.0) +BuildRequires: (crate(ucd-util/default) >= 0.1.0 with crate(ucd-util/default) < 0.2.0) -%description -%{summary}. +%global _description \ +A regular expression parser. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -A regular expression parser. +%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 +%{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 @@ -48,11 +65,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%{cargo_registry}/%{crate}-%{version}/ - %changelog +* Sat Oct 27 2018 Igor Gnatenko - 0.6.2-3 +- Adapt to new packaging + * Sun Oct 07 2018 Igor Gnatenko - 0.6.2-2 - Run tests in infrastructure