[guilt] Drop git version check altogether

[Eric Sandeen]

commit 77bddfe0c505560e4a4eb5c0c1a278a7cd78ec98
Author: Eric Sandeen <sandeen at redhat.com>
Date:   Thu May 8 18:25:43 2014 -0500

    Drop git version check altogether

 guilt-git-1.8.patch          |   12 ------------
 guilt-no-version-check.patch |   22 ++++++++++++++++++++++
 guilt.spec                   |    8 +++++---
 3 files changed, 27 insertions(+), 15 deletions(-)
---
diff --git a/guilt-no-version-check.patch b/guilt-no-version-check.patch
new file mode 100644
index 0000000..76e0952
--- /dev/null
+++ b/guilt-no-version-check.patch
@@ -0,0 +1,22 @@
+Index: guilt-0.35/guilt
+===================================================================
+--- guilt-0.35.orig/guilt
++++ guilt-0.35/guilt
+@@ -26,17 +26,6 @@ SUBDIRECTORY_OK=1
+ . "$(git --exec-path)/git-sh-setup"
+ 
+ #
+-# Git version check
+-#
+-gitver=`git --version | cut -d' ' -f3 | sed -e 's/^debian\.//'`
+-case "$gitver" in
+-	1.5.*)	;; # git config
+-	1.6.*)	;; # git config
+-	1.7.*)	;; # git config
+-	*)	die "Unsupported version of git ($gitver)" ;;
+-esac
+-
+-#
+ # Shell library
+ #
+ usage()
diff --git a/guilt.spec b/guilt.spec
index ab7767e..257d5f4 100644
--- a/guilt.spec
+++ b/guilt.spec
@@ -1,6 +1,6 @@
 Name:		guilt
 Version:	0.35
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Scripts to manage quilt-like patches on top of git
 
 Group:		Development/Tools
@@ -8,10 +8,9 @@ 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 >= 2.0
 
 Patch0:		guilt-tests-git-workaround.patch
-Patch1:		guilt-git-1.8.patch
+Patch1:		guilt-no-version-check.patch
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/guilt*.7*
 
 %changelog
+* Fri May 06 2014 Eric Sandeen <sandeen at redhat.com> 0.35-10
+- Drop git version check altogether, per upstream
+
 * Thu May 05 2014 Eric Sandeen <sandeen at redhat.com> 0.35-9
 - Allow use with git v1.9