diff --git a/rust-cargo.spec b/rust-cargo.spec index 5af63a4..eb6f8a4 100644 --- a/rust-cargo.spec +++ b/rust-cargo.spec @@ -7,7 +7,7 @@ Name: rust-%{crate} Version: 0.30.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cargo, a package manager for Rust # Upstream license specification: MIT OR Apache-2.0 @@ -22,64 +22,96 @@ Patch0: cargo-fix-metadata.diff ExclusiveArch: %{rust_arches} BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(atty) >= 0.2.0 with crate(atty) < 0.3.0) -BuildRequires: (crate(clap) >= 2.31.2 with crate(clap) < 3.0.0) -BuildRequires: (crate(crates-io) >= 0.18.0 with crate(crates-io) < 0.19.0) -BuildRequires: (crate(crossbeam-utils) >= 0.5.0 with crate(crossbeam-utils) < 0.6.0) -BuildRequires: (crate(crypto-hash) >= 0.3.1 with crate(crypto-hash) < 0.4.0) -BuildRequires: (crate(curl) >= 0.4.13 with crate(curl) < 0.5.0) -BuildRequires: (crate(env_logger) >= 0.5.4 with crate(env_logger) < 0.6.0) -BuildRequires: (crate(failure) >= 0.1.2 with crate(failure) < 0.2.0) -BuildRequires: (crate(filetime) >= 0.2.0 with crate(filetime) < 0.3.0) -BuildRequires: (crate(flate2) >= 1.0.0 with crate(flate2) < 2.0.0) -BuildRequires: (crate(fs2) >= 0.4.0 with crate(fs2) < 0.5.0) -BuildRequires: (crate(git2) >= 0.7.3 with crate(git2) < 0.8.0) -BuildRequires: (crate(git2-curl) >= 0.8.1 with crate(git2-curl) < 0.9.0) -BuildRequires: (crate(glob) >= 0.2.11 with crate(glob) < 0.3.0) -BuildRequires: (crate(hex) >= 0.3.0 with crate(hex) < 0.4.0) -BuildRequires: (crate(home) >= 0.3.0 with crate(home) < 0.4.0) -BuildRequires: (crate(ignore) >= 0.4.0 with crate(ignore) < 0.5.0) -BuildRequires: (crate(jobserver) >= 0.1.11 with crate(jobserver) < 0.2.0) -BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0) -BuildRequires: (crate(lazycell) >= 1.0.0 with crate(lazycell) < 2.0.0) -BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0) -BuildRequires: (crate(libgit2-sys) >= 0.7.5 with crate(libgit2-sys) < 0.8.0) -BuildRequires: (crate(log) >= 0.4.0 with crate(log) < 0.5.0) -BuildRequires: (crate(num_cpus) >= 1.0.0 with crate(num_cpus) < 2.0.0) -BuildRequires: (crate(openssl) >= 0.10.11 with crate(openssl) < 0.11.0) -BuildRequires: (crate(rustfix) >= 0.4.2 with crate(rustfix) < 0.5.0) -BuildRequires: (crate(same-file) >= 1.0.0 with crate(same-file) < 2.0.0) -BuildRequires: ((crate(semver) >= 0.9.0 with crate(semver) < 0.10.0) with crate(semver/serde)) -BuildRequires: (crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) -BuildRequires: (crate(serde_derive) >= 1.0.0 with crate(serde_derive) < 2.0.0) -BuildRequires: (crate(serde_ignored) >= 0.0.4 with crate(serde_ignored) < 0.0.5) -BuildRequires: (crate(serde_json) >= 1.0.0 with crate(serde_json) < 2.0.0) -BuildRequires: (crate(shell-escape) >= 0.1.0 with crate(shell-escape) < 0.2.0) +BuildRequires: (crate(atty/default) >= 0.2.0 with crate(atty/default) < 0.3.0) +BuildRequires: (crate(clap/default) >= 2.31.2 with crate(clap/default) < 3.0.0) +BuildRequires: (crate(crates-io/default) >= 0.18.0 with crate(crates-io/default) < 0.19.0) +BuildRequires: (crate(crossbeam-utils/default) >= 0.5.0 with crate(crossbeam-utils/default) < 0.6.0) +BuildRequires: (crate(crypto-hash/default) >= 0.3.1 with crate(crypto-hash/default) < 0.4.0) +BuildRequires: (crate(curl/default) >= 0.4.13 with crate(curl/default) < 0.5.0) +BuildRequires: (crate(env_logger/default) >= 0.5.4 with crate(env_logger/default) < 0.6.0) +BuildRequires: (crate(failure/default) >= 0.1.2 with crate(failure/default) < 0.2.0) +BuildRequires: (crate(filetime/default) >= 0.2.0 with crate(filetime/default) < 0.3.0) +BuildRequires: (crate(flate2/default) >= 1.0.0 with crate(flate2/default) < 2.0.0) +BuildRequires: (crate(fs2/default) >= 0.4.0 with crate(fs2/default) < 0.5.0) +BuildRequires: (crate(git2-curl/default) >= 0.8.1 with crate(git2-curl/default) < 0.9.0) +BuildRequires: (crate(git2/default) >= 0.7.3 with crate(git2/default) < 0.8.0) +BuildRequires: (crate(glob/default) >= 0.2.11 with crate(glob/default) < 0.3.0) +BuildRequires: (crate(hex/default) >= 0.3.0 with crate(hex/default) < 0.4.0) +BuildRequires: (crate(home/default) >= 0.3.0 with crate(home/default) < 0.4.0) +BuildRequires: (crate(ignore/default) >= 0.4.0 with crate(ignore/default) < 0.5.0) +BuildRequires: (crate(jobserver/default) >= 0.1.11 with crate(jobserver/default) < 0.2.0) +BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) +BuildRequires: (crate(lazycell/default) >= 1.0.0 with crate(lazycell/default) < 2.0.0) +BuildRequires: (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0) +BuildRequires: (crate(libgit2-sys/default) >= 0.7.5 with crate(libgit2-sys/default) < 0.8.0) +BuildRequires: (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0) +BuildRequires: (crate(num_cpus/default) >= 1.0.0 with crate(num_cpus/default) < 2.0.0) +BuildRequires: (crate(openssl/default) >= 0.10.11 with crate(openssl/default) < 0.11.0) +BuildRequires: (crate(rustfix/default) >= 0.4.2 with crate(rustfix/default) < 0.5.0) +BuildRequires: (crate(same-file/default) >= 1.0.0 with crate(same-file/default) < 2.0.0) +BuildRequires: (crate(semver/default) >= 0.9.0 with crate(semver/default) < 0.10.0) +BuildRequires: (crate(semver/serde) >= 0.9.0 with crate(semver/serde) < 0.10.0) +BuildRequires: (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0) +BuildRequires: (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0) +BuildRequires: (crate(serde_ignored/default) >= 0.0.4 with crate(serde_ignored/default) < 0.0.5) +BuildRequires: (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0) +BuildRequires: (crate(shell-escape/default) >= 0.1.0 with crate(shell-escape/default) < 0.2.0) BuildRequires: (crate(tar) >= 0.4.15 with crate(tar) < 0.5.0) -BuildRequires: (crate(tempfile) >= 3.0.0 with crate(tempfile) < 4.0.0) -BuildRequires: (crate(termcolor) >= 1.0.0 with crate(termcolor) < 2.0.0) -BuildRequires: (crate(toml) >= 0.4.2 with crate(toml) < 0.5.0) -BuildRequires: (crate(unicode-width) >= 0.1.5 with crate(unicode-width) < 0.2.0) -BuildRequires: (crate(url) >= 1.1.0 with crate(url) < 2.0.0) +BuildRequires: (crate(tempfile/default) >= 3.0.0 with crate(tempfile/default) < 4.0.0) +BuildRequires: (crate(termcolor/default) >= 1.0.0 with crate(termcolor/default) < 2.0.0) +BuildRequires: (crate(toml/default) >= 0.4.2 with crate(toml/default) < 0.5.0) +BuildRequires: (crate(unicode-width/default) >= 0.1.5 with crate(unicode-width/default) < 0.2.0) +BuildRequires: (crate(url/default) >= 1.1.0 with crate(url/default) < 2.0.0) %if %{with check} -# [dev-dependencies] -BuildRequires: (crate(bufstream) >= 0.1.0 with crate(bufstream) < 0.2.0) +BuildRequires: (crate(bufstream/default) >= 0.1.0 with crate(bufstream/default) < 0.2.0) BuildRequires: git-core %endif -%description -%{summary}. +%global _description \ +Cargo, a package manager for Rust. + +%description %{_description} %package devel Summary: %{summary} BuildArch: noarch -%description devel -Cargo, a package manager for Rust. +%description devel %{_description} + +This package contains library source intended for building other packages +which use "%{crate}" crate. + +%files devel +%license LICENSE-APACHE LICENSE-MIT +%doc ARCHITECTURE.md CONTRIBUTING.md README.md src/doc +%{cargo_registry}/%{crate}-%{version}/ +%exclude %{cargo_registry}/%{crate}-%{version}/{appveyor.yml,etc} +# We ship it as part of rust.src +%exclude %{_bindir}/cargo + +%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 %{crate} from crates.io. +which use "default" feature of "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+openssl-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+openssl-devel %{_description} + +This package contains library source intended for building other packages +which use "openssl" feature of "%{crate}" crate. + +%files -n %{name}+openssl-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep %autosetup -n %{crate}-%{version} -p1 @@ -96,15 +128,10 @@ which use %{crate} from crates.io. %cargo_test %endif -%files devel -%license LICENSE-APACHE LICENSE-MIT -%doc ARCHITECTURE.md CONTRIBUTING.md README.md src/doc -%{cargo_registry}/%{crate}-%{version}/ -%exclude %{cargo_registry}/%{crate}-%{version}/{appveyor.yml,etc} -# We ship it as part of rust.src -%exclude %{_bindir}/cargo - %changelog +* Tue Nov 13 2018 Josh Stone - 0.30.0-2 +- Adapt to new packaging + * Mon Sep 10 2018 Igor Gnatenko - 0.29.0-2 - Switch to crossbeam-utils