[rpms/rust-pretty-git-prompt] epel10: Bump git2 to 0.7

[rpms/rust-pretty-git-prompt] epel10: Bump git2 to 0.7

[Igor Gnatenko]

            A new commit has been pushed.

            Repo   : rpms/rust-pretty-git-prompt
            Branch : epel10
            Commit : 1aefb7a65c088e3113ef3f7ce72ee6b097ef8e66
            Author : Igor Gnatenko <ignatenkobrain@fedoraproject.org>
            Date   : 2018-03-12T11:52:46+01:00
            Stats  : +67/-2 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/rust-pretty-git-prompt/c/1aefb7a65c088e3113ef3f7ce72ee6b097ef8e66?branch=epel10

            Log:
            Bump git2 to 0.7

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

---
diff --git a/0001-deps-update-git2-to-0.7.patch b/0001-deps-update-git2-to-0.7.patch
new file mode 100644
index 0000000..a798c66
--- /dev/null
+++ b/0001-deps-update-git2-to-0.7.patch
@@ -0,0 +1,46 @@
+From 37471bc537989dd89af4d96df0aaaf49208c8203 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <ignatenko@redhat.com>
+Date: Mon, 12 Mar 2018 11:49:56 +0100
+Subject: [PATCH] deps: update git2 to 0.7
+
+Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
+---
+ src/backend.rs | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/backend.rs b/src/backend.rs
+index bf8f6b0..4975fe0 100644
+--- a/src/backend.rs
++++ b/src/backend.rs
+@@ -352,8 +352,8 @@ impl Backend {
+         }
+         let mut d = HashMap::new();
+ 
+-        let changed = STATUS_WT_MODIFIED | STATUS_WT_DELETED | STATUS_WT_TYPECHANGE | STATUS_WT_RENAMED;
+-        let staged = STATUS_INDEX_MODIFIED | STATUS_INDEX_DELETED | STATUS_INDEX_TYPECHANGE | STATUS_INDEX_RENAMED | STATUS_INDEX_NEW;
++        let changed = Status::WT_MODIFIED | Status::WT_DELETED | Status::WT_TYPECHANGE | Status::WT_RENAMED;
++        let staged = Status::INDEX_MODIFIED | Status::INDEX_DELETED | Status::INDEX_TYPECHANGE | Status::INDEX_RENAMED | Status::INDEX_NEW;
+ 
+         let statuses = match self.get_status() {
+             Some(x) => x,
+@@ -368,7 +368,7 @@ impl Backend {
+                 let counter = d.entry(CHANGED_KEY.to_string()).or_insert(0);
+                 *counter += 1;
+             };
+-            if file_status.contains(STATUS_WT_NEW) {
++            if file_status.contains(Status::WT_NEW) {
+                 let counter = d.entry(NEW_KEY.to_string()).or_insert(0);
+                 *counter += 1;
+             };
+@@ -376,7 +376,7 @@ impl Backend {
+                 let counter = d.entry(STAGED_KEY.to_string()).or_insert(0);
+                 *counter += 1;
+             };
+-            if file_status.intersects(STATUS_CONFLICTED) {
++            if file_status.intersects(Status::CONFLICTED) {
+                 let counter = d.entry(CONFLICTS_KEY.to_string()).or_insert(0);
+                 *counter += 1;
+             };
+-- 
+2.16.2
+

diff --git a/pretty-git-prompt-0.2.0-fix-metadata.diff b/pretty-git-prompt-0.2.0-fix-metadata.diff
new file mode 100644
index 0000000..cddc955
--- /dev/null
+++ b/pretty-git-prompt-0.2.0-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- pretty-git-prompt-0.2.0/Cargo.toml	1970-01-01T01:00:00+01:00
++++ pretty-git-prompt-0.2.0/Cargo.toml	2018-03-12T11:51:22.897029+01:00
+@@ -30,7 +30,7 @@
+ default-features = false
+ 
+ [dependencies.git2]
+-version = "0.6"
++version = "0.7"
+ features = []
+ default-features = false
+ 

diff --git a/rust-pretty-git-prompt.spec b/rust-pretty-git-prompt.spec
index 27301d6..7b76430 100644
--- a/rust-pretty-git-prompt.spec
+++ b/rust-pretty-git-prompt.spec
@@ -5,19 +5,24 @@
 
 Name:           rust-%{crate}
 Version:        0.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Your current git repository information inside a beautiful shell prompt
 
 License:        MIT
 URL:            https://crates.io/crates/pretty-git-prompt
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
+# Initial patched metadata
+# * Bump git2 to 0.7, https://github.com/TomasTomecek/pretty-git-prompt/pull/39
+Patch0:         pretty-git-prompt-0.2.0-fix-metadata.diff
+# Make it work with new git2
+Patch1:         0001-deps-update-git2-to-0.7.patch
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 # [dependencies]
 BuildRequires:  (crate(clap) >= 2.19.0 with crate(clap) < 3.0.0)
-BuildRequires:  (crate(git2) >= 0.6.0 with crate(git2) < 0.7.0)
+BuildRequires:  (crate(git2) >= 0.7.0 with crate(git2) < 0.8.0)
 BuildRequires:  (crate(yaml-rust) >= 0.3.4 with crate(yaml-rust) < 0.4.0)
 
 %description
@@ -52,6 +57,9 @@ Summary:        %{summary}
 %{_bindir}/pretty-git-prompt
 
 %changelog
+* Mon Mar 12 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.2.0-3
+- Bump git2 to 0.7
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild