From 13f9070ae7dcd521dcf9cbebb6dfb3d8aeb7f92e Mon Sep 17 00:00:00 2001
From: Neal Becker <nbecker@fedoraproject.org>
Date: Feb 24 2009 19:24:04 +0000
Subject: Use noreplace option on config


---

diff --git a/mercurial.spec b/mercurial.spec
index ecfc7a7..4620145 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -3,7 +3,7 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
 Version: 1.1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
@@ -151,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/zsh/site-functions/
 %dir %{_sysconfdir}/mercurial
 %dir %{_sysconfdir}/mercurial/hgrc.d
-%config %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
+%config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
@@ -170,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT
 #cd tests && %{__python} run-tests.py
 
 %changelog
+* Tue Feb 24 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-7
+- Use noreplace option on config
+
 * Mon Feb 23 2009 Neal Becker <ndbecker2@gmail.com> - 1.1.2-6
 - Fix typo