From 98cdec7ba7492a7ade42f90ab504c332c5d3265c Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 15 Sep 2018 16:35:41 +0200
Subject: [PATCH] add cbindgen back

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 cbindgen-fix-metadata.diff | 11 +++++------
 rust-cbindgen.spec         | 25 ++++++++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/cbindgen-fix-metadata.diff b/cbindgen-fix-metadata.diff
index 894f41c..1fbc69b 100644
--- a/cbindgen-fix-metadata.diff
+++ b/cbindgen-fix-metadata.diff
@@ -1,12 +1,11 @@
 --- cbindgen-0.6.3/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ cbindgen-0.6.3/Cargo.toml	2018-09-05T21:05:02.892509+02:00
-@@ -39,9 +39,6 @@
- version = "1.0"
++++ cbindgen-0.6.3/Cargo.toml	2018-09-15T16:34:36.842009+02:00
+@@ -40,7 +40,7 @@
  features = ["derive"]
  
--[dependencies.serde_derive]
+ [dependencies.serde_derive]
 -version = "=1.0.21"
--
++version = "=1.0.58"
+ 
  [dependencies.serde_json]
  version = "1.0"
- 
diff --git a/rust-cbindgen.spec b/rust-cbindgen.spec
index a9a97ed..fb2b1ad 100644
--- a/rust-cbindgen.spec
+++ b/rust-cbindgen.spec
@@ -1,13 +1,11 @@
 # Generated by rust2rpm
-# Tests are run in infrastructure
-%bcond_with check
-%global debug_package %{nil}
+%bcond_without check
 
 %global crate cbindgen
 
 Name:           rust-%{crate}
 Version:        0.6.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for generating C bindings to Rust code
 
 # Upstream license specification: MPL-2.0
@@ -15,7 +13,7 @@ License:        MPLv2.0
 URL:            https://crates.io/crates/cbindgen
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
-# * Remove pinned serde_derive, https://github.com/eqrion/cbindgen/pull/179
+# * Bump pinned serde, https://github.com/eqrion/cbindgen/pull/207
 Patch0:         cbindgen-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
@@ -25,6 +23,7 @@ BuildRequires:  rust-packaging
 BuildRequires:  (crate(clap) >= 2.0.0 with crate(clap) < 3.0.0)
 BuildRequires:  (crate(log) >= 0.4.0 with crate(log) < 0.5.0)
 BuildRequires:  ((crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) with crate(serde/derive))
+BuildRequires:  crate(serde_derive) = 1.0.58
 BuildRequires:  (crate(serde_json) >= 1.0.0 with crate(serde_json) < 2.0.0)
 BuildRequires:  ((crate(syn) >= 0.14.0 with crate(syn) < 0.15.0) with crate(syn/clone-impls) with crate(syn/derive) with crate(syn/extra-traits) with crate(syn/full) with crate(syn/parsing) with crate(syn/printing))
 BuildRequires:  (crate(tempfile) >= 3.0.0 with crate(tempfile) < 4.0.0)
@@ -33,6 +32,12 @@ BuildRequires:  (crate(toml) >= 0.4.0 with crate(toml) < 0.5.0)
 %description
 %{summary}.
 
+%package     -n %{crate}
+Summary:        %{summary}
+
+%description -n %{crate}
+%{summary}.
+
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -58,14 +63,20 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
+%files       -n %{crate}
+%license LICENSE
+%doc README.md
+%{_bindir}/cbindgen
+
 %files          devel
 %license LICENSE
 %doc ARCHITECTURE.md CONTRIBUTING.md README.md
 %{cargo_registry}/%{crate}-%{version}/
-# https://bugzilla.redhat.com/show_bug.cgi?id=1608670
-%exclude %{_bindir}/cbindgen
 
 %changelog
+* Sat Sep 15 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.3-2
+- Add cbindgen back
+
 * Wed Sep 05 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.3-1
 - Update to 0.6.3