Update to 0.10.2. Fixes bug #1114970

3 files changed, 9 insertions, 18 deletions

diff --git a/cgit-0.10.1-raw-patch.patch b/cgit-0.10.1-raw-patch.patch
deleted file mode 100644
index 753e2ea..0000000
--- a/cgit-0.10.1-raw-patch.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur cgit-0.10.1.orig/ui-patch.c cgit-0.10.1/ui-patch.c
---- cgit-0.10.1.orig/ui-patch.c	2014-02-27 16:12:08.000000000 -0700
-+++ cgit-0.10.1/ui-patch.c	2014-06-11 21:09:53.205184135 -0600
-@@ -82,4 +82,6 @@
- 		log_tree_commit(&rev, commit);
- 		printf("-- \ncgit %s\n\n", cgit_version);
- 	}
-+	
-+	fflush(stdout);
- }
diff --git a/cgit.spec b/cgit.spec
index 20aaad8..26718af 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,6 +1,6 @@
 # Review bug: https://bugzilla.redhat.com/479723
 
-%global gitver      1.9.0
+%global gitver      2.0.1
 %global cachedir    %{_localstatedir}/cache/%{name}
 %global filterdir   %{_libexecdir}/%{name}/filters
 %global scriptdir   %{_localstatedir}/www/cgi-bin
@@ -21,15 +21,15 @@ make V=1 %{?_smp_mflags} \\\
      prefix=%{_prefix}
 
 Name:           cgit
-Version:        0.10.1
-Release:        4%{?dist}
+Version:        0.10.2
+Release:        1%{?dist}
 Summary:        A fast web interface for git
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://git.zx2c4.com/cgit/
 Source0:        http://git.zx2c4.com/cgit/snapshot/%{name}-%{version}.tar.xz
-Source1:        http://git-core.googlecode.com/files/git-%{gitver}.tar.gz
+Source1:        http://www.kernel.org/pub/software/scm/git//git-%{gitver}.tar.xz
 Source2:        cgitrc
 Source3:        cgit.httpd
 # On all but RHEL5 highlight is version 3. 
@@ -37,7 +37,6 @@ Source3:        cgit.httpd
 Patch1:         cgit-0.9.1-highlightv3.patch
 BuildRequires:  highlight
 %endif
-Patch2:         cgit-0.10.1-raw-patch.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  asciidoc
@@ -62,7 +61,6 @@ Cgit is a fast web interface for git.  It uses caching to increase performance.
 %if 0%{?fedora} || 0%{?rhel} >= 6
 %patch1 -p1
 %endif
-%patch2 -p1
 
 # setup the git dir
 rm -rf git
@@ -107,6 +105,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 01 2014 Kevin Fenzi <kevin@scrye.com> 0.10.2-1
+- Update to 0.10.2. Fixes bug #1114970
+
 * Wed Jun 11 2014 Kevin Fenzi <kevin@scrye.com> 0.10.1-4
 - Add patch to fix raw patch handling
 
diff --git a/sources b/sources
index e043d7b..6a3be2e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e16c14b27c644b8e0dd72bdb5ff77450  git-1.9.0.tar.gz
-060ef0aa95ebda6ea7daf823214bc4d0  cgit-0.10.1.tar.xz
+6682d597f6e3e76645a254c7be537bd3  cgit-0.10.2.tar.xz
+6d28a5d112379c20c7f7df9e0ffb070c  git-2.0.1.tar.xz