From 33067b35dc2d62f28f5d3eab70b025d7c43c6eaf Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 23 Apr 2020 11:36:34 -0700
Subject: [PATCH] Bump to cargo 0.44

---
 0001-Upgrade-to-cargo-0.44.patch | 38 ++++++++++++++++++++++++++++++++
 cargo-c-fix-metadata.diff        | 11 +++++++++
 rust-cargo-c.spec                |  9 +++++++-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 0001-Upgrade-to-cargo-0.44.patch
 create mode 100644 cargo-c-fix-metadata.diff

diff --git a/0001-Upgrade-to-cargo-0.44.patch b/0001-Upgrade-to-cargo-0.44.patch
new file mode 100644
index 0000000..a81aa1f
--- /dev/null
+++ b/0001-Upgrade-to-cargo-0.44.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 0000000..58dfd3b
--- /dev/null
+++ b/cargo-c-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- 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 9d31a78..1d2905e 100644
--- a/rust-cargo-c.spec
+++ b/rust-cargo-c.spec
@@ -5,13 +5,17 @@
 
 Name:           rust-%{crate}
 Version:        0.6.3
-Release:        1%{?dist}
+Release:        2%{?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}
@@ -82,6 +86,9 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Thu Apr 23 2020 Josh Stone <jistone@redhat.com> - 0.6.3-2
+- Bump to cargo 0.44
+
 * Fri Apr 17 2020 Josh Stone <jistone@redhat.com> - 0.6.3-1
 - Update to 0.6.3