From 2b56a7f9f2c3956dfa30b92194b9e88590a54742 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Tue, 7 Jun 2022 21:47:26 +0200
Subject: [PATCH] Update to version 0.14.4; Fixes RHBZ#2058285

---
 .gitignore     |  1 +
 .rust2rpm.conf |  1 -
 rust-git2.spec | 42 ++++++++++++++++++++++++++++--------------
 sources        |  2 +-
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 77c8970..ebda4b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /git2-0.13.20.crate
 /git2-0.13.24.crate
 /git2-0.13.25.crate
+/git2-0.14.4.crate
diff --git a/.rust2rpm.conf b/.rust2rpm.conf
index 97d617d..0415a4b 100644
--- a/.rust2rpm.conf
+++ b/.rust2rpm.conf
@@ -2,6 +2,5 @@
 buildrequires =
   /usr/bin/git
 unwanted-features =
-  vendored-libgit2
   vendored-openssl
   zlib-ng-compat
diff --git a/rust-git2.spec b/rust-git2.spec
index e53c82c..3293a23 100644
--- a/rust-git2.spec
+++ b/rust-git2.spec
@@ -1,22 +1,22 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 21
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate git2
 
 Name:           rust-%{crate}
-Version:        0.13.25
+Version:        0.14.4
 Release:        %autorelease
 Summary:        Bindings to libgit2 for interoperating with git repositories
 
-# Upstream license specification: MIT/Apache-2.0
+# Upstream license specification: MIT OR Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/git2
 Source:         %{crates_source}
 
 ExclusiveArch:  %{rust_arches}
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Bindings to libgit2 for interoperating with git repositories. This library is
@@ -35,9 +35,11 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CONTRIBUTING.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -49,7 +51,7 @@ This package contains library source intended for building other packages which
 use the "default" feature of the "%{crate}" crate.
 
 %files       -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+https-devel
 Summary:        %{summary}
@@ -61,7 +63,7 @@ This package contains library source intended for building other packages which
 use the "https" feature of the "%{crate}" crate.
 
 %files       -n %{name}+https-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+openssl-probe-devel
 Summary:        %{summary}
@@ -73,7 +75,7 @@ This package contains library source intended for building other packages which
 use the "openssl-probe" feature of the "%{crate}" crate.
 
 %files       -n %{name}+openssl-probe-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+openssl-sys-devel
 Summary:        %{summary}
@@ -85,7 +87,7 @@ This package contains library source intended for building other packages which
 use the "openssl-sys" feature of the "%{crate}" crate.
 
 %files       -n %{name}+openssl-sys-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+ssh-devel
 Summary:        %{summary}
@@ -97,7 +99,7 @@ This package contains library source intended for building other packages which
 use the "ssh" feature of the "%{crate}" crate.
 
 %files       -n %{name}+ssh-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+ssh_key_from_memory-devel
 Summary:        %{summary}
@@ -109,7 +111,7 @@ This package contains library source intended for building other packages which
 use the "ssh_key_from_memory" feature of the "%{crate}" crate.
 
 %files       -n %{name}+ssh_key_from_memory-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+unstable-devel
 Summary:        %{summary}
@@ -121,7 +123,19 @@ This package contains library source intended for building other packages which
 use the "unstable" feature of the "%{crate}" crate.
 
 %files       -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+vendored-libgit2-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+vendored-libgit2-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "vendored-libgit2" feature of the "%{crate}" crate.
+
+%files       -n %{name}+vendored-libgit2-devel
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 9ee89f9..7617361 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git2-0.13.25.crate) = 666f11464f34d82abd994f00a0b81e960551c4c524b4f00d28e5c728172dfa894fec65050767cc96d18d1d5de57f1e901154fe8d70e2e31b93b93790bce021ab
+SHA512 (git2-0.14.4.crate) = 05a5894eb90e5371525222f69321c2376f6b8e0306a04ff05a9917005ca77a86b6100ec19338e47265599f3a61603511991ea8664e7c64702a580841ef98963a