From 21e2695602c60e5e13bba4a7afa88260456066c5 Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@fedoraproject.org>
Date: Fri, 16 Sep 2005 18:10:58 +0000
Subject: [PATCH] auto-import git-core-0.99.6-1 on branch devel from    
 git-core-0.99.6-1.src.rpm

---
 .cvsignore    |  2 +-
 git-core.spec | 12 +++++++-----
 sources       |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c591405..88321a6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-git-core-0.99.4.tar.gz
+git-core-0.99.6.tar.gz
diff --git a/git-core.spec b/git-core.spec
index 4e8c33a..4e1ca4d 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documetnation
 Name: 		git-core
-Version: 	0.99.4
-Release: 	4%{?dist}
+Version: 	0.99.6
+Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
 Group: 		Development/Tools
@@ -24,12 +24,11 @@ elsewhere for tools for ordinary humans layered on top of this.
 
 %build
 make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc}
-make COPTS="$RPM_OPT_FLAGS" -C tools all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
-     install install-tools %{!?_without_docs: install-doc}
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} \
+     install %{!?_without_docs: install-doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -44,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{!?_without_docs: %{_mandir}/man7/*.7.gz}
 
 %changelog
+* Fri Sep 16 2005 Chris Wright <chrisw@osdl.org> 0.99.6-1
+- update to 0.99.6
+
 * Thu Aug 18 2005 Chris Wright <chrisw@osdl.org> 0.99.4-4
 - drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
 - use RPM_OPT_FLAGS in spec file, drop patch0
diff --git a/sources b/sources
index 6ccf369..771b23b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06935e265e7a556d8819a097dcb44f35  git-core-0.99.4.tar.gz
+ca2f17bc1550909a2675386e8be46f0f  git-core-0.99.6.tar.gz