From 9986766cf5996f5543acb498f921fcf0b8c7a5b0 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 10 Feb 2019 10:25:05 +0100
Subject: [PATCH] Update to 0.8.0

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 .gitignore             |  1 +
 git2-fix-metadata.diff | 10 ++++++++++
 rust-git2.spec         | 25 +++++++++++++++----------
 sources                |  2 +-
 4 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 git2-fix-metadata.diff

diff --git a/.gitignore b/.gitignore
index fc5b422..f83260e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /git2-0.7.0.crate
 /git2-0.7.1.crate
 /git2-0.7.5.crate
+/git2-0.8.0.crate
diff --git a/git2-fix-metadata.diff b/git2-fix-metadata.diff
new file mode 100644
index 0000000..a88d979
--- /dev/null
+++ b/git2-fix-metadata.diff
@@ -0,0 +1,10 @@
+--- git2-0.8.0/Cargo.toml	1970-01-01T01:00:00+01:00
++++ git2-0.8.0/Cargo.toml	2019-02-10T10:25:20.287684+01:00
+@@ -61,7 +61,6 @@
+ ssh = ["libgit2-sys/ssh"]
+ ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
+ unstable = []
+-vendored-openssl = ["openssl-sys/vendored"]
+ [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe]
+ version = "0.1"
+ optional = true
diff --git a/rust-git2.spec b/rust-git2.spec
index 49006a4..606f74e 100644
--- a/rust-git2.spec
+++ b/rust-git2.spec
@@ -6,15 +6,17 @@
 %global crate git2
 
 Name:           rust-%{crate}
-Version:        0.7.5
-Release:        2%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        Bindings to libgit2 for interoperating with git repositories
 
 # Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/git2
-Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
-
+Source:         %{crates_source}
+# Initial patched metadata
+# * No vendored openssl
+Patch0:         git2-fix-metadata.diff
 # libgit2 0.27 doesn't have this field -- see rust-libgit2-sys
 Patch1:         rust-git2-no-include_depth.patch
 
@@ -23,11 +25,11 @@ ExclusiveArch:  %{rust_arches}
 BuildRequires:  rust-packaging
 BuildRequires:  (crate(bitflags/default) >= 1.0.0 with crate(bitflags/default) < 2.0.0)
 BuildRequires:  (crate(libc/default) >= 0.2.0 with crate(libc/default) < 0.3.0)
-BuildRequires:  (crate(libgit2-sys/curl) >= 0.7.7 with crate(libgit2-sys/curl) < 0.8.0)
-BuildRequires:  (crate(libgit2-sys/default) >= 0.7.7 with crate(libgit2-sys/default) < 0.8.0)
-BuildRequires:  (crate(libgit2-sys/https) >= 0.7.7 with crate(libgit2-sys/https) < 0.8.0)
-BuildRequires:  (crate(libgit2-sys/ssh) >= 0.7.7 with crate(libgit2-sys/ssh) < 0.8.0)
-BuildRequires:  (crate(libgit2-sys/ssh_key_from_memory) >= 0.7.7 with crate(libgit2-sys/ssh_key_from_memory) < 0.8.0)
+BuildRequires:  (crate(libgit2-sys/curl) >= 0.7.11 with crate(libgit2-sys/curl) < 0.8.0)
+BuildRequires:  (crate(libgit2-sys/default) >= 0.7.11 with crate(libgit2-sys/default) < 0.8.0)
+BuildRequires:  (crate(libgit2-sys/https) >= 0.7.11 with crate(libgit2-sys/https) < 0.8.0)
+BuildRequires:  (crate(libgit2-sys/ssh) >= 0.7.11 with crate(libgit2-sys/ssh) < 0.8.0)
+BuildRequires:  (crate(libgit2-sys/ssh_key_from_memory) >= 0.7.11 with crate(libgit2-sys/ssh_key_from_memory) < 0.8.0)
 BuildRequires:  (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0)
 BuildRequires:  (crate(openssl-probe/default) >= 0.1.0 with crate(openssl-probe/default) < 0.2.0)
 BuildRequires:  (crate(openssl-sys/default) >= 0.9.0 with crate(openssl-sys/default) < 0.10.0)
@@ -159,7 +161,7 @@ which use "unstable" feature of "%{crate}" crate.
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
 %build
@@ -174,6 +176,9 @@ which use "unstable" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Sun Feb 10 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 0e73e20..a8b275a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git2-0.7.5.crate) = 94d6ee17368a8476ff415dd4de61b02a19b756de44084a787d093323fb11692d17d30aadfc5c1037e7f70b0e5f94aa0d1b6639c9f9afa17c19d6638b7cdcee4e
+SHA512 (git2-0.8.0.crate) = 06270d9f1284796d1c56c4bcac7de477b4665f6c32b5d8ea2fe816d4ff72d662f67f3482349d5d2b055232d9f1619f6fb7afcc7fe0a9053df7133efd9fd342d7