[guilt/f19] Allow use with git v1.9

[Eric Sandeen]

commit b6d80b5e7a9b2c9bc3af84d4b4ebb205d8d02afd
Author: Eric Sandeen <sandeen at redhat.com>
Date:   Thu May 8 15:18:34 2014 -0500

    Allow use with git v1.9

 guilt-git-1.8.patch |    3 ++-
 guilt.spec          |    7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/guilt-git-1.8.patch b/guilt-git-1.8.patch
index e68a53f..e8984f0 100644
--- a/guilt-git-1.8.patch
+++ b/guilt-git-1.8.patch
@@ -1,10 +1,11 @@
 --- a/guilt	
 +++ a/guilt	
-@@ -33,6 +33,7 @@ case "$gitver" in
+@@ -33,6 +33,8 @@ case "$gitver" in
  	1.5.*)	;; # git config
  	1.6.*)	;; # git config
  	1.7.*)	;; # git config
 +	1.8.*)  ;; # git config
++	1.9.*)  ;; # git config
  	*)	die "Unsupported version of git ($gitver)" ;;
  esac
  
diff --git a/guilt.spec b/guilt.spec
index 699db0e..b050168 100644
--- a/guilt.spec
+++ b/guilt.spec
@@ -1,6 +1,6 @@
 Name:		guilt
 Version:	0.35
-Release:	7%{?dist}
+Release:	9%{?dist}
 Summary:	Scripts to manage quilt-like patches on top of git
 
 Group:		Development/Tools
@@ -8,7 +8,7 @@ License:	GPLv2
 URL:		http://www.kernel.org/pub/linux/kernel/people/jsipek/%{name}/
 Source:		http://www.kernel.org/pub/linux/kernel/people/jsipek/%{name}/%{name}-%{version}.tar.bz2
 Requires:	git, gawk, sed, bash
-Conflicts:	git >= 1.9
+Conflicts:	git >= 2.0
 
 Patch0:		guilt-tests-git-workaround.patch
 Patch1:		guilt-git-1.8.patch
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/guilt*.7*
 
 %changelog
+* Thu May 05 2014 Eric Sandeen <sandeen at redhat.com> 0.35-9
+- Allow use with git v1.9
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild