rpms/mercurial/devel mercurial.spec,1.60,1.61

[Neal Becker]

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30346

Modified Files:
	mercurial.spec 
Log Message:
Fix patch0



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mercurial.spec	7 Feb 2009 12:20:32 -0000	1.60
+++ mercurial.spec	7 Feb 2009 12:23:53 -0000	1.61
@@ -3,7 +3,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -79,7 +79,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
 make all
@@ -168,6 +168,9 @@
 #cd tests && %{__python} run-tests.py
 
 %changelog
+* Sat Feb  7 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-3
+- Patch mergetools.hgrc to fix filemerge bug
+
 * Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-2
 - Rename mergetools.rc -> mergetools.rc.sample