From c547c9a400ea83b6601cd3e5c83d89381eeb0397 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Thu, 25 Aug 2022 12:26:35 +0200
Subject: [PATCH] Update package.license in Cargo.toml to reflect bundled
 dependencies

---
 libgit2-sys-fix-metadata.diff | 11 ++++++++++-
 rust-libgit2-sys.spec         | 23 +++++++++++------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/libgit2-sys-fix-metadata.diff b/libgit2-sys-fix-metadata.diff
index 24c0166..d7a4a30 100644
--- a/libgit2-sys-fix-metadata.diff
+++ b/libgit2-sys-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- libgit2-sys-0.13.4+1.4.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ libgit2-sys-0.13.4+1.4.2/Cargo.toml	2022-05-25T11:00:08.639367+00:00
++++ libgit2-sys-0.13.4+1.4.2/Cargo.toml	2022-08-25T10:17:20.696469+00:00
 @@ -12,7 +12,7 @@
  [package]
  edition = "2018"
@@ -9,6 +9,15 @@
  authors = [
      "Josh Triplett <josh@joshtriplett.org>",
      "Alex Crichton <alex@alexcrichton.com>",
+@@ -27,7 +27,7 @@
+     "libgit2/tests/*",
+ ]
+ description = "Native bindings to the libgit2 library"
+-license = "MIT OR Apache-2.0"
++license = "MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause"
+ repository = "https://github.com/rust-lang/git2-rs"
+ 
+ [lib]
 @@ -58,11 +58,6 @@
  ssh = ["libssh2-sys"]
  ssh_key_from_memory = []
diff --git a/rust-libgit2-sys.spec b/rust-libgit2-sys.spec
index f325d0f..d47fc0b 100644
--- a/rust-libgit2-sys.spec
+++ b/rust-libgit2-sys.spec
@@ -1,25 +1,29 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 22
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate libgit2-sys
 %global upstream_version 0.13.4+1.4.2
 
-Name:           rust-%{crate}
+Name:           rust-libgit2-sys
 Version:        0.13.4
 Release:        %autorelease
 Summary:        Native bindings to the libgit2 library
 
-# Upstream license specification: MIT OR Apache-2.0
-License:        MIT or ASL 2.0
+# * libgit2-sys crate:      MIT OR Apache-2.0
+# * bundled libgit2:        GPL-2.0-only WITH GCC-exception-2.0
+# * bundled http-parser:    MIT
+# * bundled pcre:           BSD-3-Clause
+License:        MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause
 URL:            https://crates.io/crates/libgit2-sys
 Source:         %{crates_source %{crate} %{upstream_version}}
-# Initial patched metadata
+# Manually created patch for downstream crate metadata changes
 # * remove libgit2 version from version field
-Patch0:         libgit2-sys-fix-metadata.diff
+# * update package.license field to reflect bundled dependencies
+Patch:          libgit2-sys-fix-metadata.diff
 # * build against the bundled copy of libgit2 unconditionally:
 #   the version in the Fedora repositories is too old
-Patch1:         0001-build-with-vendored-libgit2-unconditionally.patch
+Patch:          0001-build-with-vendored-libgit2-unconditionally.patch
 
 ExclusiveArch:  %{rust_arches}
 
@@ -34,15 +38,10 @@ Native bindings to the libgit2 library.}
 Summary:        %{summary}
 BuildArch:      noarch
 
-# libgit2: GPLv2 with exceptions
 Provides:       bundled(libgit2) = 1.4.2
-# http-parser: MIT
 Provides:       bundled(http-parser) = 2.0
-# pcre: BSD
 Provides:       bundled(pcre) = 8.44
 
-License:        MIT and GPLv2 with exceptions and BSD
-
 %description    devel %{_description}
 
 This package contains library source intended for building other packages which