--- cgit.changes.orig
+++ cgit.changes
@@ -1,28 +1,17 @@
 -------------------------------------------------------------------
-Tue Oct  4 20:27:08 CEST 2011 - tiwai@suse.de
+Fri Oct 14 10:13:03 CEST 2011 - tiwai@suse.de
 
-- updated to git 1.7.7; see git changelog for more details
+- split from OBS git repo to an individual repo (since cgit-0.9
+  doesn't build with git-1.7.7)
+- merged fixes in git repo back to cgit repo
+- updated to git 1.7.6.4
 
 -------------------------------------------------------------------
-Mon Sep 26 12:57:01 CEST 2011 - tiwai@suse.de
+Wed Aug  3 21:35:48 UTC 2011 - asn@cryptomilk.org
 
-- updated to git 1.7.6.4; see git changelog for more details
-
--------------------------------------------------------------------
-Wed Sep 21 08:43:35 CEST 2011 - tiwai@suse.de
-
-- updated to 1.7.6.2, 1.7.6.3: see git changelog for more details
-
--------------------------------------------------------------------
-Thu Aug 25 12:23:22 CEST 2011 - tiwai@suse.de
-
-- update to git 1.7.6.1: see git changelog for more details
-
--------------------------------------------------------------------
-Fri Aug  5 15:13:43 CEST 2011 - tiwai@suse.de
-
-- Fix VUL-0: cgit: XSS flaw in rename hint (CVE-2011-2711,
-  bnc#707929)
+- updated to cgit 0.9.0.2
+- fixed potential XSS vulnerability in rename hint
+- fixed a segfault with git 1.7.6
 
 -------------------------------------------------------------------
 Mon Jun 27 18:22:11 CEST 2011 - tiwai@suse.de
--- cgit.spec.orig
+++ cgit.spec
@@ -17,21 +17,21 @@
 
 # norootforbuild
 
-%define git_version	1.7.7
+%define git_version	1.7.6.4
 
 Name:           cgit
 Url:            http://hjemli.net/git/cgit/
 License:        GPLv2
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
-Version:        0.9
-Release:        9
+Version:        0.9.0.2
+Release:        7
 Summary:        A web frontend for git repositories
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        git-%{git_version}.tar.gz
 Source2:        cgitrc
 Patch:          cgit-optflags.diff
-Patch1:         cgit-git-1.7.5.x-build-fix.diff
+Patch1:         cgit-git-1.7.6_build_fix.patch
 Patch2:         cgit-CVE-2011-2711-fix.diff
 # Requirements for cgit
 BuildRequires:  gnu-crypto libopenssl-devel libzip-devel