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

[Neal Becker]

Author: nbecker

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

Modified Files:
	mercurial.spec 
Log Message:
Patch mergetools.rc for filemerge bug



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mercurial.spec	1 Jan 2009 17:46:04 -0000	1.59
+++ mercurial.spec	7 Feb 2009 12:20:32 -0000	1.60
@@ -9,6 +9,8 @@
 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 -p0
 
 %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