From f1ee95091cdfba597ae9c2fee1f0fbfa0bfa5f10 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 9 Mar 2019 15:37:13 +0100
Subject: [PATCH] Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rust-test-assembler.spec                      | 49 ++++++++++++-------
 ...a.diff => test-assembler-fix-metadata.diff |  2 +-
 tests/.fmf/version                            |  1 +
 tests/provision.fmf                           |  5 ++
 tests/tests.yml                               | 13 +++++
 5 files changed, 52 insertions(+), 18 deletions(-)
 rename test-assembler-0.1.5-fix-metadata.diff => test-assembler-fix-metadata.diff (69%)
 create mode 100644 tests/.fmf/version
 create mode 100644 tests/provision.fmf
 create mode 100644 tests/tests.yml

diff --git a/rust-test-assembler.spec b/rust-test-assembler.spec
index d2a66ab..1b4d388 100644
--- a/rust-test-assembler.spec
+++ b/rust-test-assembler.spec
@@ -1,42 +1,59 @@
 # Generated by rust2rpm
-%bcond_without check
+%bcond_with check
 %global debug_package %{nil}
 
 %global crate test-assembler
 
 Name:           rust-%{crate}
 Version:        0.1.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Set of types for building complex binary streams
 
 License:        MIT
 URL:            https://crates.io/crates/test-assembler
-Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
+Source:         %{crates_source}
 # Initial patched metadata
 # * Bump byteorder to 1, https://github.com/luser/rust-test-assembler/pull/7
-Patch0:         test-assembler-0.1.5-fix-metadata.diff
+Patch0:         test-assembler-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(byteorder) >= 1.0.0 with crate(byteorder) < 2.0.0)
+BuildRequires:  (crate(byteorder/default) >= 1.0.0 with crate(byteorder/default) < 2.0.0)
 
-%description
-%{summary}.
+%global _description \
+A set of types for building complex binary streams.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A set of types for building complex binary streams.
+%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
+%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
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
 %build
@@ -50,12 +67,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-
 %changelog
+* Sat Mar 09 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.5-6
+- Adapt to new packaging
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/test-assembler-0.1.5-fix-metadata.diff b/test-assembler-fix-metadata.diff
similarity index 69%
rename from test-assembler-0.1.5-fix-metadata.diff
rename to test-assembler-fix-metadata.diff
index b37f07a..ad3d67d 100644
--- a/test-assembler-0.1.5-fix-metadata.diff
+++ b/test-assembler-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- test-assembler-0.1.5/Cargo.toml	2016-09-12T23:02:38+02:00
-+++ test-assembler-0.1.5/Cargo.toml	2017-12-03T21:06:49.517005+01:00
++++ test-assembler-0.1.5/Cargo.toml	2019-03-09T15:36:29.251205+01:00
 @@ -12,4 +12,4 @@
  ]
  
diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/provision.fmf b/tests/provision.fmf
new file mode 100644
index 0000000..503a97c
--- /dev/null
+++ b/tests/provision.fmf
@@ -0,0 +1,5 @@
+---
+standard-inventory-qcow2:
+  qemu:
+    # `cargo test` usually eats more than 1G.
+    m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..c3dc84d
--- /dev/null
+++ 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-test-assembler