diff --git a/rust-native-tls.spec b/rust-native-tls.spec index 8fdc53b..dfa9da0 100644 --- a/rust-native-tls.spec +++ b/rust-native-tls.spec @@ -7,7 +7,7 @@ Name: rust-%{crate} Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wrapper over a platform's native TLS implementation # Upstream license specification: MIT/Apache-2.0 @@ -22,27 +22,44 @@ Patch0: native-tls-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(openssl) >= 0.10.15 with crate(openssl) < 0.11.0) -BuildRequires: (crate(openssl-probe) >= 0.1.0 with crate(openssl-probe) < 0.2.0) -BuildRequires: (crate(openssl-sys) >= 0.9.30 with crate(openssl-sys) < 0.10.0) +BuildRequires: (crate(openssl-probe/default) >= 0.1.0 with crate(openssl-probe/default) < 0.2.0) +BuildRequires: (crate(openssl-sys/default) >= 0.9.30 with crate(openssl-sys/default) < 0.10.0) +BuildRequires: (crate(openssl/default) >= 0.10.15 with crate(openssl/default) < 0.11.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(hex) >= 0.3.0 with crate(hex) < 0.4.0) +BuildRequires: (crate(hex/default) >= 0.3.0 with crate(hex/default) < 0.4.0) %endif -%description -%{summary}. +%global _description \ +A wrapper over a platform's native TLS implementation. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -A wrapper over a platform's native TLS implementation. +%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 CHANGELOG.md +%{cargo_registry}/%{crate}-%{version}/ +%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml + +%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 @@ -59,13 +76,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md CHANGELOG.md -%{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml - %changelog +* Mon Nov 12 2018 Josh Stone - 0.2.2-2 +- Adapt to new packaging + * Mon Oct 22 2018 Josh Stone - 0.2.2-1 - Update to 0.2.2