From b14bdfad528b2902d11fdfb911e31a7213528d25 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Feb 13 2024 21:03:53 +0000
Subject: Rebuild for CVE-2024-24575 and CVE-2024-24577 in libgit2


---

diff --git a/pretty-git-prompt-fix-metadata.diff b/pretty-git-prompt-fix-metadata.diff
index 05913a2..e78ff2d 100644
--- a/pretty-git-prompt-fix-metadata.diff
+++ b/pretty-git-prompt-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- pretty-git-prompt-0.2.1/Cargo.toml	2020-04-06T08:36:01+00:00
-+++ pretty-git-prompt-0.2.1/Cargo.toml	2023-05-10T17:03:42.201125+00:00
++++ pretty-git-prompt-0.2.1/Cargo.toml	2024-02-13T20:25:46.512406+00:00
 @@ -17,7 +17,7 @@
  description = "Your current git repository information inside a beautiful shell prompt."
  homepage = "https://github.com/TomasTomecek/pretty-git-prompt"
@@ -9,3 +9,12 @@
  repository = "https://github.com/TomasTomecek/pretty-git-prompt"
  
  [[bin]]
+@@ -29,7 +29,7 @@
+ default-features = false
+ 
+ [dependencies.git2]
+-version = "0.13"
++version = "0.18"
+ features = []
+ default-features = false
+ 
diff --git a/rust-pretty-git-prompt.spec b/rust-pretty-git-prompt.spec
index 91f2529..7abd48f 100644
--- a/rust-pretty-git-prompt.spec
+++ b/rust-pretty-git-prompt.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 # * tests can only be run inside the upstream git repository:
 #   https://github.com/tomastomecek/pretty-git-prompt/issues/35
 %bcond_with check
@@ -14,11 +14,12 @@ License:        MIT
 URL:            https://crates.io/crates/pretty-git-prompt
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
+# * bump git2 dependency from 0.13 to 0.18
 # * set "license" instead of "license-file" in crate metadata;
 #   "license-file" is intended to be used for non-standard licenses only
 Patch:          pretty-git-prompt-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 23
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Your current git repository information inside a beautiful shell prompt.}
@@ -27,8 +28,8 @@ Your current git repository information inside a beautiful shell prompt.}
 
 %package     -n %{crate}
 Summary:        %{summary}
+# (MIT OR Apache-2.0) AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MIT
 # MIT
-# MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause
 # MIT OR Apache-2.0
 # MIT OR Apache-2.0 OR Zlib
 # Zlib OR Apache-2.0 OR MIT
@@ -44,7 +45,7 @@ License:        MIT AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND
 %{_bindir}/pretty-git-prompt
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
@@ -52,7 +53,7 @@ License:        MIT AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND
 
 %build
 %cargo_build
-%cargo_license_summary
+%{cargo_license_summary}
 %{cargo_license} > LICENSE.dependencies
 
 %install