rpms/mercurial/devel mercurial.spec,1.67,1.68

[Neal Becker]

Author: nbecker

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

Modified Files:
	mercurial.spec 
Log Message:
patch for filemerge bug should (hopefully) not be needed


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- mercurial.spec	5 Mar 2009 01:42:28 -0000	1.67
+++ mercurial.spec	5 Mar 2009 01:52:29 -0000	1.68
@@ -3,14 +3,14 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 Source1: mercurial-site-start.el
 # temporary fix for filemerge bug
-Patch0: mercurial-mergetools.hgrc.patch
+#Patch0: mercurial-mergetools.hgrc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python python-devel
 BuildRequires: emacs emacs-el pkgconfig
@@ -79,7 +79,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+#%patch0 -p1
 
 %build
 make all
@@ -170,6 +170,9 @@
 #cd tests && %{__python} run-tests.py
 
 %changelog
+* Wed Mar  4 2009 Neal Becker <ndbecker2 at gmail.com> - 1.2-2
+- patch0 for filemerge bug should not be needed
+
 * Wed Mar  4 2009 Neal Becker <ndbecker2 at gmail.com> - 1.2-1
 - Update to 1.2