rpms/mercurial/F-9 mercurial-mergetools.hgrc.patch, 1.1, 1.2 mercurial.spec, 1.52, 1.53

[Neal Becker]

Author: nbecker

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

Modified Files:
	mercurial-mergetools.hgrc.patch mercurial.spec 
Log Message:
fix for filemerge bug

mercurial-mergetools.hgrc.patch:

Index: mercurial-mergetools.hgrc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-9/mercurial-mergetools.hgrc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mercurial-mergetools.hgrc.patch	16 Apr 2008 11:10:59 -0000	1.1
+++ mercurial-mergetools.hgrc.patch	7 Feb 2009 12:41:07 -0000	1.2
@@ -1,16 +1,12 @@
---- contrib/mergetools.hgrc.orig	2008-03-24 19:05:20.000000000 -0400
-+++ contrib/mergetools.hgrc	2008-04-15 15:27:46.000000000 -0400
-@@ -1,11 +1,12 @@
- # Some default global settings for common merge tools
+--- mercurial-1.1.2/contrib/mergetools.hgrc.orig	2009-02-07 07:14:46.000000000 -0500
++++ mercurial-1.1.2/contrib/mergetools.hgrc	2009-02-07 07:14:15.000000000 -0500
+@@ -46,6 +46,6 @@
+ ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
+ ecmerge.gui=True
  
- [merge-tools]
--kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
-+kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
- kdiff3.regkey=Software\KDiff3
- kdiff3.regappend=\kdiff3.exe
- kdiff3.fixeol=True
- kdiff3.gui=True
-+kdiff3.priority=1
- 
- gvimdiff.args=--nofork -d -g -O $local $other $base
- gvimdiff.regkey=Software\Vim\GVim
+-filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
+-filemerge.args=-left $other -right $local -ancestor $base -merge $output
+-filemerge.gui=True
++#filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
++#filemerge.args=-left $other -right $local -ancestor $base -merge $output
++#filemerge.gui=True


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-9/mercurial.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mercurial.spec	1 Jan 2009 17:52:38 -0000	1.52
+++ mercurial.spec	7 Feb 2009 12:41:07 -0000	1.53
@@ -3,12 +3,14 @@
 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/
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python python-devel
 BuildRequires: emacs emacs-el pkgconfig
@@ -24,7 +26,6 @@
 Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
 
 %define pkg mercurial
-#%define pkgname Foo
 
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
@@ -78,6 +79,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make all
@@ -129,7 +131,7 @@
 EOF
 install hgk.rc $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
-install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -147,7 +149,7 @@
 %{_bindir}/mercurial-convert-repo
 %dir %{_sysconfdir}/mercurial
 %dir %{_sysconfdir}/mercurial/hgrc.d
-%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
+%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
@@ -166,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.rc to fix filemerge bug
+
 * Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-2
 - Rename mergetools.rc -> mergetools.rc.sample