rpms/mercurial/F-8 mercurial.spec,1.37,1.38 sources,1.17,1.18

[Neal Becker (nbecker)]

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11815

Modified Files:
	mercurial.spec sources 
Log Message:
Add patch for mergetools.hgrc
Install mergetools.hgrc as mergetools.rc



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-8/mercurial.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mercurial.spec	12 Apr 2008 14:46:07 -0000	1.37
+++ mercurial.spec	16 Apr 2008 13:25:33 -0000	1.38
@@ -3,12 +3,13 @@
 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/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 Source1: mercurial-site-start.el
+Patch0: mercurial-mergetools.hgrc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 BuildRequires: emacs emacs-el 
@@ -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
+install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -166,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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Apr 2008 14:40:40 -0000	1.17
+++ sources	16 Apr 2008 13:25:33 -0000	1.18
@@ -1,2 +1,3 @@
 9f8dd7fa6f8886f77be9b923f008504c  mercurial-1.0.tar.gz
 04d22d401ce507989137d7171c2502f0  mercurial-site-start.el
+48afc53e60fff52d2283a8c028436abd  mercurial-mergetools.hgrc.patch