From 95787e0215affad4b4043dffdd832de715ce7b46 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 27 Apr 2020 13:16:36 -0700
Subject: [PATCH] Update to 0.6.4

---
 .gitignore                       |  1 +
 0001-Upgrade-to-cargo-0.44.patch | 38 --------------------------------
 cargo-c-fix-metadata.diff        | 11 ---------
 rust-cargo-c.spec                | 11 +++++----
 sources                          |  2 +-
 5 files changed, 7 insertions(+), 56 deletions(-)
 delete mode 100644 0001-Upgrade-to-cargo-0.44.patch
 delete mode 100644 cargo-c-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index 919e462..24960a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /cargo-c-0.5.3.crate
 /cargo-c-0.6.2.crate
 /cargo-c-0.6.3.crate
+/cargo-c-0.6.4.crate
diff --git a/0001-Upgrade-to-cargo-0.44.patch b/0001-Upgrade-to-cargo-0.44.patch
deleted file mode 100644
index a81aa1f..0000000
--- a/0001-Upgrade-to-cargo-0.44.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e8589e45b63f65b18d0086dad03eda35a33ec150 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Thu, 23 Apr 2020 11:20:56 -0700
-Subject: [PATCH] Upgrade to cargo 0.44
-
----
- src/build.rs | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/src/build.rs b/src/build.rs
-index 2ea9a9aaf863..7610d598b606 100644
---- a/src/build.rs
-+++ b/src/build.rs
-@@ -263,15 +263,14 @@ pub fn cbuild(
- 
- pub fn config_configure(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
-     let arg_target_dir = &args.value_of_path("target-dir", config);
--    let config_args: Vec<&str> = args.values_of("config").unwrap_or_default().collect();
--    let quiet = if args.is_present("quiet") {
--        Some(true)
--    } else {
--        None
--    };
-+    let config_args: Vec<_> = args
-+        .values_of("config")
-+        .unwrap_or_default()
-+        .map(String::from)
-+        .collect();
-     config.configure(
-         args.occurrences_of("verbose") as u32,
--        quiet,
-+        args.is_present("quiet"),
-         args.value_of("color"),
-         args.is_present("frozen"),
-         args.is_present("locked"),
--- 
-2.25.3
-
diff --git a/cargo-c-fix-metadata.diff b/cargo-c-fix-metadata.diff
deleted file mode 100644
index 58dfd3b..0000000
--- a/cargo-c-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- cargo-c-0.6.3/Cargo.toml	2020-04-16T19:03:23+00:00
-+++ cargo-c-0.6.3/Cargo.toml	2020-04-23T18:22:04.383679+00:00
-@@ -34,7 +34,7 @@
- version = "1.0"
- 
- [dependencies.cargo]
--version = "0.43"
-+version = "0.44"
- 
- [dependencies.cbindgen]
- version = "0.14.0"
diff --git a/rust-cargo-c.spec b/rust-cargo-c.spec
index 1d2905e..a770634 100644
--- a/rust-cargo-c.spec
+++ b/rust-cargo-c.spec
@@ -4,18 +4,14 @@
 %global crate cargo-c
 
 Name:           rust-%{crate}
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Helper program to build and install c-like libraries
 
 # Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/cargo-c
 Source:         %{crates_source}
-# Initial patched metadata
-# * Bump to cargo 0.44, https://github.com/lu-zero/cargo-c/pull/68
-Patch0:         cargo-c-fix-metadata.diff
-Patch1:         0001-Upgrade-to-cargo-0.44.patch
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -86,6 +82,9 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Fri Apr 24 2020 Josh Stone <jistone@redhat.com> - 0.6.4-1
+- Update to 0.6.4
+
 * Thu Apr 23 2020 Josh Stone <jistone@redhat.com> - 0.6.3-2
 - Bump to cargo 0.44
 
diff --git a/sources b/sources
index efd2ed7..6e78468 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cargo-c-0.6.3.crate) = 610a29c474e103fe1ef2037081fdbea60cab9e0f4931640d9469dad02644b994f21a4604f9908cd85b22d31fc500030642d4f647dcaded32c2171c58d79517c4
+SHA512 (cargo-c-0.6.4.crate) = b348c821f35b2ad5c68f1de707f336409f4e27f716dc41164091c11449b30ef85008e511ed7a6b3f1bbfe9c1309656d3763678cfa5113afecf9ae749ea37ad1b