Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
6 years ago · 0497b92a48
parent 8cf36e6d5f
commit 0497b92a48
4 changed files with 155 additions and 25 deletions
--- a/rust-flate2.spec
+++ b/rust-flate2.spec
@ -1,12 +1,13 @@
 # Generated by rust2rpm
-%bcond_without check
+# * Tests are run in infrastructure
+%bcond_with check
 %global debug_package %{nil}

 %global crate flate2

 Name:           rust-%{crate}
 Version:        1.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DEFLATE compression and decompression exposed as Reader/Writer streams

 # Upstream license specification: MIT/Apache-2.0
@ -17,34 +18,147 @@ Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
 ExclusiveArch:  %{rust_arches}

 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(futures) >= 0.1.0 with crate(futures) < 0.2.0)
-BuildRequires:  (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0)
-BuildRequires:  (crate(libz-sys) >= 1.0.0 with crate(libz-sys) < 2.0.0)
-BuildRequires:  (crate(miniz-sys) >= 0.1.11 with crate(miniz-sys) < 0.2.0)
-BuildRequires:  ((crate(miniz_oxide_c_api) >= 0.2.0 with crate(miniz_oxide_c_api) < 0.3.0) with crate(miniz_oxide_c_api/no_c_export))
-BuildRequires:  (crate(tokio-io) >= 0.1.0 with crate(tokio-io) < 0.2.0)
+BuildRequires:  (crate(futures/default) >= 0.1.0 with crate(futures/default) < 0.2.0)
+BuildRequires:  (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0)
+BuildRequires:  (crate(libz-sys/default) >= 1.0.0 with crate(libz-sys/default) < 2.0.0)
+BuildRequires:  (crate(miniz-sys/default) >= 0.1.11 with crate(miniz-sys/default) < 0.2.0)
+BuildRequires:  (crate(miniz_oxide_c_api/default) >= 0.2.0 with crate(miniz_oxide_c_api/default) < 0.3.0)
+BuildRequires:  (crate(miniz_oxide_c_api/no_c_export) >= 0.2.0 with crate(miniz_oxide_c_api/no_c_export) < 0.3.0)
+BuildRequires:  (crate(tokio-io/default) >= 0.1.0 with crate(tokio-io/default) < 0.2.0)
 %if %{with check}
-# [dev-dependencies]
 BuildRequires:  (crate(quickcheck) >= 0.7.0 with crate(quickcheck) < 0.8.0)
-BuildRequires:  (crate(rand) >= 0.5.0 with crate(rand) < 0.6.0)
-BuildRequires:  (crate(tokio-core) >= 0.1.0 with crate(tokio-core) < 0.2.0)
+BuildRequires:  (crate(rand/default) >= 0.5.0 with crate(rand/default) < 0.6.0)
+BuildRequires:  (crate(tokio-core/default) >= 0.1.0 with crate(tokio-core/default) < 0.2.0)
 %endif

-%description
-%{summary}.
+%global _description \
+Bindings to miniz.c for DEFLATE compression and decompression exposed as\
+Reader/Writer streams. Contains bindings for zlib, deflate, and gzip-based\
+streams.
+
+%description %{_description}

 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch

-%description    devel
-Bindings to miniz.c for DEFLATE compression and decompression exposed as
-Reader/Writer streams. Contains bindings for zlib, deflate, and gzip-based
-streams.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+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 %{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}+futures-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+futures-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "futures" feature of "%{crate}" crate.
+
+%files       -n %{name}+futures-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+libz-sys-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+libz-sys-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "libz-sys" feature of "%{crate}" crate.
+
+%files       -n %{name}+libz-sys-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+miniz-sys-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+miniz-sys-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "miniz-sys" feature of "%{crate}" crate.
+
+%files       -n %{name}+miniz-sys-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+miniz_oxide_c_api-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+miniz_oxide_c_api-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "miniz_oxide_c_api" feature of "%{crate}" crate.
+
+%files       -n %{name}+miniz_oxide_c_api-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+rust_backend-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+rust_backend-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "rust_backend" feature of "%{crate}" crate.
+
+%files       -n %{name}+rust_backend-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+tokio-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+tokio-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "tokio" feature of "%{crate}" crate.
+
+%files       -n %{name}+tokio-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+tokio-io-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+tokio-io-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "tokio-io" feature of "%{crate}" crate.
+
+%files       -n %{name}+tokio-io-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+zlib-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+zlib-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "zlib" feature of "%{crate}" crate.
+
+%files       -n %{name}+zlib-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml

 %prep
 %autosetup -n %{crate}-%{version} -p1
@ -61,13 +175,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif

-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
-
 %changelog
+* Sun Nov 04 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.4-2
+- Adapt to new packaging
+
 * Mon Oct 22 2018 Josh Stone <jistone@redhat.com> - 1.0.4-1
 - Update to 1.0.4

--- a/tests/.fmf/version
+++ b/tests/.fmf/version
@ -0,0 +1 @@
+1
--- a/tests/provision.fmf
+++ b/tests/provision.fmf
@ -0,0 +1,5 @@
+---
+standard-inventory-qcow2:
+  qemu:
+    # `cargo test` usually eats more than 1G.
+    m: 4G
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/rust.git"
+      dest: rust
+    tests:
+    - rust/cargo-test
+    environment:
+      pkg: rust-flate2