Sync with cvs tag git-1_6_0_6-1_fc11fedora/devel

3 files changed, 10 insertions, 3 deletions

diff --git a/.cvsignore b/.cvsignore
index 69ce87c..3db4196 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-git-1.6.0.5.tar.bz2
+git-1.6.0.6.tar.bz2
diff --git a/git.spec b/git.spec
index e741afa..040d620 100644
--- a/git.spec
+++ b/git.spec
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.6.0.5
+Version: 	1.6.0.6
 Release: 	1%{?dist}
 Summary:  	Core git tools
 License: 	GPLv2
@@ -98,6 +98,7 @@ Git tools for sending email.
 Summary:        Git GUI tool
 Group:          Development/Tools
 Requires:       git = %{version}-%{release}, tk >= 8.4
+Requires:       gitk = %{version}-%{release}
 %description gui
 Git GUI tool.
 
@@ -260,6 +261,12 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sat Dec 20 2008 Todd Zullinger <tmz@pobox.com> 1.6.0.6-1
+- git-1.6.0.6
+- Fixes a local privilege escalation bug in gitweb
+  (http://article.gmane.org/gmane.comp.version-control.git/103624)
+- Add gitk Requires to git-gui (bug 476308)
+
 * Thu Dec 11 2008 Josh Boyer <jboyer@gmail.com> 1.6.0.5-1
 - git-1.6.0.5
 
diff --git a/sources b/sources
index 69eade4..383d999 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-899172ebeac65f7a09a8e204d4f87d8c  git-1.6.0.5.tar.bz2
+b5be9b34b441cb57f92086bfaf59f255  git-1.6.0.6.tar.bz2