rpms/git/devel git.spec, 1.61, 1.62 git-gitweb-commitdiff.patch, 1.1, NONE

[James Bowes (jbowes)]

Author: jbowes

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10292

Modified Files:
	git.spec 
Removed Files:
	git-gitweb-commitdiff.patch 
Log Message:
Remove the commitdiff patch, it's upstream already


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- git.spec	28 Mar 2008 13:47:49 -0000	1.61
+++ git.spec	2 Apr 2008 12:24:12 -0000	1.62
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
 Version: 	1.5.4.5
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	Core git tools
 License: 	GPLv2
 Group: 		Development/Tools
@@ -11,7 +11,6 @@
 Source2:	git.xinetd
 Source3:	git.conf.httpd
 Patch0:		git-1.5-gitweb-home-link.patch
-Patch1:		git-gitweb-commitdiff.patch
 BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -129,7 +128,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -259,6 +257,9 @@
 # No files for you!
 
 %changelog
+* Wed Apr 02 2008 James Bowes <jbowes at redhat.com> 1.5.4.5-2
+- Remove a patch that's already upstream.
+
 * Fri Mar 28 2008 James Bowes <jbowes at redhat.com> 1.5.4.5-1
 - git-1.5.4.5
 


--- git-gitweb-commitdiff.patch DELETED ---