[guilt] Fix conflicts line to work with git 1.8.x

[Eric Sandeen]

commit cf63cc0125b36cd0129baf0a523132c94c0af7df
Author: Eric Sandeen <sandeen at redhat.com>
Date:   Fri Jan 4 19:03:57 2013 -0600

    Fix conflicts line to work with git 1.8.x

 guilt.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/guilt.spec b/guilt.spec
index 20f44e0..e12dda3 100644
--- a/guilt.spec
+++ b/guilt.spec
@@ -1,6 +1,6 @@
 Name:		guilt
 Version:	0.35
-Release:	5%{?dist}
+Release:	6%{?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.8
+Conflicts:	git >= 1.9
 
 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
+* Fri Jan 04 2013 Eric Sandeen <sandeen at redhat.com> 0.35-6
+- Conflict with next major version of git, not minor versions past 1.8
+
 * Thu Dec 20 2012 Eric Sandeen <sandeen at redhat.com> 0.35-5
 - Allow guilt to work w/ git 1.8 (#887245)