rpms/mercurial/devel mercurial.spec,1.42,1.43

[Neal Becker (nbecker)]

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11568

Modified Files:
	mercurial.spec 
Log Message:
Install mergetools.hgrc as mergetools.rc



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mercurial.spec	16 Apr 2008 11:10:59 -0000	1.42
+++ mercurial.spec	16 Apr 2008 13:23:23 -0000	1.43
@@ -3,7 +3,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 1.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -131,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
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -168,6 +168,9 @@
 #cd tests && python run-tests.py
 
 %changelog
+* Wed Apr 16 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-13
+- install mergetools.hgrc as mergetools.rc
+
 * Sat Apr 12 2008 Neal Becker <ndbecker2 at gmail.com> - 1.0-12
 - Remove xemacs pkg - this is moved to xemacs-extras
 - Own %{python_sitearch}/{mercurial,hgext} dirs