rpms/mercurial/F-10 mercurial.spec,1.59,1.60 sources,1.25,1.26

[Neal Becker]

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19118

Modified Files:
	mercurial.spec sources 
Log Message:
update to 1.2: see http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-10/mercurial.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mercurial.spec	27 Feb 2009 16:27:06 -0000	1.59
+++ mercurial.spec	5 Mar 2009 02:05:57 -0000	1.60
@@ -2,15 +2,15 @@
 
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 1.1.2
-Release: 7%{?dist}
+Version: 1.2
+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,12 @@
 #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
+
 * Tue Feb 24 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-7
 - Use noreplace option on config
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	1 Jan 2009 18:06:28 -0000	1.25
+++ sources	5 Mar 2009 02:05:57 -0000	1.26
@@ -1 +1 @@
-4fd3b9a2e5dcd025840c3849b136bec8  mercurial-1.1.2.tar.gz
+ac9d16b078f99f7a89d6865421570f05  mercurial-1.2.tar.gz