[guilt] Fix to work w/ git 1.8

[Eric Sandeen]

commit ce912d21e8a440151439ad02863ea743aff933dd
Author: Eric Sandeen <sandeen at redhat.com>
Date:   Thu Dec 20 22:31:16 2012 -0600

    Fix to work w/ git 1.8

 guilt-git-1.8.patch |   11 +++++++++++
 guilt.spec          |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/guilt-git-1.8.patch b/guilt-git-1.8.patch
new file mode 100644
index 0000000..e68a53f
--- /dev/null
+++ b/guilt-git-1.8.patch
@@ -0,0 +1,11 @@
+--- a/guilt	
++++ a/guilt	
+@@ -33,6 +33,7 @@ case "$gitver" in
+ 	1.5.*)	;; # git config
+ 	1.6.*)	;; # git config
+ 	1.7.*)	;; # git config
++	1.8.*)  ;; # git config
+ 	*)	die "Unsupported version of git ($gitver)" ;;
+ esac
+ 
+
diff --git a/guilt.spec b/guilt.spec
index d8bb122..20f44e0 100644
--- a/guilt.spec
+++ b/guilt.spec
@@ -1,6 +1,6 @@
 Name:		guilt
 Version:	0.35
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Scripts to manage quilt-like patches on top of git
 
 Group:		Development/Tools
@@ -8,8 +8,10 @@ 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.8
 
 Patch0:		guilt-tests-git-workaround.patch
+Patch1:		guilt-git-1.8.patch
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,6 +29,7 @@ made to your patches.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 make ASCIIDOC='asciidoc --unsafe' %{?_smp_mflags}
@@ -51,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/guilt*.7*
 
 %changelog
+* Thu Dec 20 2012 Eric Sandeen <sandeen at redhat.com> 0.35-5
+- Allow guilt to work w/ git 1.8 (#887245)
+
 * Fri Aug 03 2012 Eric Sandeen <sandeen at redhat.com> 0.35-4
 - Work around regression tests failures due to git change w.r.t. empty patches