From ed87a71e655eb639cbb207e78a83c9dadfc7f22c Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 29 Jul 2018 07:32:54 +0200
Subject: [PATCH] Update to 0.4.1

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 .gitignore                      |  1 +
 globset-0.4.0-fix-metadata.diff | 13 -------------
 rust-globset.spec               | 14 +++++++-------
 sources                         |  2 +-
 tests/.fmf/version              |  1 +
 tests/provision.fmf             |  5 +++++
 tests/tests.yml                 | 13 +++++++++++++
 7 files changed, 28 insertions(+), 21 deletions(-)
 delete mode 100644 globset-0.4.0-fix-metadata.diff
 create mode 100644 tests/.fmf/version
 create mode 100644 tests/provision.fmf
 create mode 100644 tests/tests.yml

diff --git a/.gitignore b/.gitignore
index b8d7546..f9c95c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /globset-0.2.1.crate
 /globset-0.3.0.crate
 /globset-0.4.0.crate
+/globset-0.4.1.crate
diff --git a/globset-0.4.0-fix-metadata.diff b/globset-0.4.0-fix-metadata.diff
deleted file mode 100644
index 6cb6bfa..0000000
--- a/globset-0.4.0-fix-metadata.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- globset-0.4.0/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ globset-0.4.0/Cargo.toml	2018-06-12T09:52:53.099432+02:00
-@@ -38,9 +38,6 @@
- version = "2"
- 
- [dependencies.regex]
--version = "0.2.9"
-+version = "1"
- [dev-dependencies.glob]
- version = "0.2"
--
--[features]
--simd-accel = ["regex/simd-accel"]
diff --git a/rust-globset.spec b/rust-globset.spec
index f7481a1..19aeca1 100644
--- a/rust-globset.spec
+++ b/rust-globset.spec
@@ -1,21 +1,18 @@
 # Generated by rust2rpm
-%bcond_without check
+# Tests are run in infrastructure
+%bcond_with check
 %global debug_package %{nil}
 
 %global crate globset
 
 Name:           rust-%{crate}
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        Single glob and glob set matching
 
 License:        Unlicense or MIT
 URL:            https://crates.io/crates/globset
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
-# Initial patched metadata
-# * No simd
-# * Bump regex to 1
-Patch0:         globset-0.4.0-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
@@ -67,6 +64,9 @@ which use %{crate} from crates.io.
 %{cargo_registry}/%{crate}-%{version}/
 
 %changelog
+* Sun Jul 29 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.1-1
+- Update to 0.4.1
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index ef86d41..76c9d22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (globset-0.4.0.crate) = f24b8d9aa298859bba38f8a5bbacb8f2cb6a8f6fe165a14409216d27d856885e234220a15d66c133725cba39a802139c6242f2e5f3787154f929b92152f4d1a8
+SHA512 (globset-0.4.1.crate) = 3cc7fb4b296ebc8c0a20d8080a9cf913ec61f2ed14bd45c2aebd0c73101514b3895123a93c5e1b5037362a74e18057fd6deefb5c91ff3880aa88ca0e1fb9095c
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..a63f209
--- /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-globset