From 460e11314710f06268d44226fe24c0c2839bf2fd Mon Sep 17 00:00:00 2001
From: Igor Raits <ignatenkobrain@fedoraproject.org>
Date: Sun, 28 Nov 2021 17:12:34 +0100
Subject: [PATCH] Update to 0.13.24

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
---
 .gitignore             |  1 +
 .rust2rpm.conf         |  4 ++++
 git2-fix-metadata.diff | 22 +++++++---------------
 rust-git2.spec         |  5 ++---
 sources                |  2 +-
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0377af5..c118302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /git2-0.13.17.crate
 /git2-0.13.19.crate
 /git2-0.13.20.crate
+/git2-0.13.24.crate
diff --git a/.rust2rpm.conf b/.rust2rpm.conf
index dd0f003..97d617d 100644
--- a/.rust2rpm.conf
+++ b/.rust2rpm.conf
@@ -1,3 +1,7 @@
 [DEFAULT]
 buildrequires =
   /usr/bin/git
+unwanted-features =
+  vendored-libgit2
+  vendored-openssl
+  zlib-ng-compat
diff --git a/git2-fix-metadata.diff b/git2-fix-metadata.diff
index 8b8b676..32a77c4 100644
--- a/git2-fix-metadata.diff
+++ b/git2-fix-metadata.diff
@@ -1,20 +1,12 @@
---- git2-0.13.20/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ git2-0.13.20/Cargo.toml	2021-11-28T08:05:09.962412+00:00
-@@ -46,7 +46,7 @@
+--- git2-0.13.24/Cargo.toml	1970-01-01T00:00:01+00:00
++++ git2-0.13.24/Cargo.toml	2021-11-28T16:12:00.235342+00:00
+@@ -44,9 +44,6 @@
+ [dev-dependencies.tempfile]
  version = "3.1.0"
  
- [dev-dependencies.thread-id]
+-[dev-dependencies.thread-id]
 -version = "3.3.0"
-+version = "4"
- 
+-
  [dev-dependencies.time]
  version = "0.1.39"
-@@ -57,8 +57,6 @@
- ssh = ["libgit2-sys/ssh"]
- ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
- unstable = []
--vendored-openssl = ["openssl-sys/vendored"]
--zlib-ng-compat = ["libgit2-sys/zlib-ng-compat"]
- [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 a288d64..01298d1 100644
--- a/rust-git2.spec
+++ b/rust-git2.spec
@@ -5,7 +5,7 @@
 %global crate git2
 
 Name:           rust-%{crate}
-Version:        0.13.20
+Version:        0.13.24
 Release:        %autorelease
 Summary:        Bindings to libgit2 for interoperating with git repositories
 
@@ -14,8 +14,7 @@ License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/git2
 Source:         %{crates_source}
 # Initial patched metadata
-# * No vendored/zlib-ng features
-# * Bump thread-id to 4, https://github.com/rust-lang/git2-rs/pull/775
+# * Drop thread-id dependency, https://github.com/rust-lang/git2-rs/pull/776
 Patch0:         git2-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
diff --git a/sources b/sources
index 25f13dd..b05cb8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git2-0.13.20.crate) = 2c0a9cf3391f4ea5eaa48c8fcc08a1cf27b877cc4960332bfdbb95620f9b161f720c35f87bf98e3771749a01444bf8e2337e6d8fc1a34962d4b041473115293f
+SHA512 (git2-0.13.24.crate) = 34d74a3102b752c6dcf7d3fd60888ce07abec5ea16e9ad9a3aa3381151474475e502362dd2b8ef661b46ed08098cb5ec9505a2c0f1642dfb6eda495e04db0371